feat(protocol-designer): remove name labware prompt for tipracks (#1853)

Closes #1779
Opentrons · Jul 12, 2018 · a1597a7 · a1597a7
1 parent 88a9856
commit a1597a7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/protocol-designer/src/containers/LabwareContainer.js b/protocol-designer/src/containers/LabwareContainer.js
@@ -2,6 +2,7 @@
 import * as React from 'react'
 import {connect} from 'react-redux'
 
+import {getLabware} from '@opentrons/shared-data'
 import {selectors} from '../labware-ingred/reducers'
 import {
   openIngredientSelector,
@@ -56,10 +57,15 @@ function mapStateToProps (state: BaseState, ownProps: OwnProps): StateProps {
   const isSelectedSlot = !!(selectedContainer && selectedContainer.slot === slot)
 
   const deckSetupMode = steplistSelectors.deckSetupMode(state)
+  const labwareHasName = container && selectors.getSavedLabware(state)[container.id]
+  const labwareData = container && getLabware(container.type)
+  // TODO: Ian 2018-07-10 use shared-data accessor
+  const isTiprack = labwareData && labwareData.metadata.isTiprack
+
   return {
     ...containerInfo,
     slot,
-    showNameOverlay: (container && !selectors.getSavedLabware(state)[container.id]),
+    showNameOverlay: container && !isTiprack && !labwareHasName,
     canAdd: selectors.canAdd(state),
     activeModals: selectors.activeModals(state),
     labwareToCopy: selectors.labwareToCopy(state),