in RA, but alignment is a little wonky

app/src/components/ChangePipette/PipetteSelection.js

@@ -19,19 +19,20 @@ const OPTIONS = getAllPipetteNames().map(name => ({
 }))
 
 export default function PipetteSelection(props: PipetteSelectionProps) {
- let pipetteOptions
- if (props.__pipettePlusEnabled) {
- pipetteOptions = OPTIONS
- } else {
- pipetteOptions = filter(OPTIONS, function(pipette) {
- return !pipette.name.includes('GEN2')
- })
+ let nameBlacklist = []
+ if (!props.__pipettePlusEnabled) {
+ nameBlacklist = [
+ 'p20_multi_gen2',
+ 'p20_single_gen2',
+ 'p300_multi_gen2',
+ 'p300_single_gen2',
+ 'p1000_single_gen2',
+ ]
  }
-
  return (
  <label className={styles.pipette_selection}>
  <span className={styles.pipette_selection_label}>{LABEL}</span>
- <PipetteSelect {...props} />
+ <PipetteSelect {...props} nameBlacklist={nameBlacklist} />
  </label>
  )
 }

components/src/instrument/PipetteSelect.js

@@ -40,7 +40,7 @@ const clearStyles = () => null
 const PipetteSelect = (props: SelectProps) => {
  const filteredNames = without(
  getAllPipetteNames('maxVolume', 'channels'),
- ...props.nameBlacklist
+ ...(props.nameBlacklist || [])
  )
  const allPipetteNameSpecs = map(filteredNames, getPipetteNameSpecs)
  const nameSpecsByCategory = groupBy(allPipetteNameSpecs, 'displayCategory')

components/src/instrument/index.js

@@ -4,7 +4,14 @@ import InstrumentGroup from './InstrumentGroup'
 import InstrumentInfo from './InstrumentInfo'
 import type { InstrumentInfoProps } from './InstrumentInfo'
 import InfoItem from './InfoItem'
+import PipetteSelect from './PipetteSelect'
 
-export { InstrumentDiagram, InstrumentGroup, InstrumentInfo, InfoItem }
+export {
+ InstrumentDiagram,
+ InstrumentGroup,
+ InstrumentInfo,
+ InfoItem,
+ PipetteSelect,
+}
 
 export type { InstrumentInfoProps }