Merge branch 'edge' into app_desktop-error-boundary

Opentrons · Jan 17, 2024 · a05f87e · a05f87e
2 parents 5259f95 + 15ece39
commit a05f87e
Show file tree

Hide file tree

Showing 437 changed files with 84,293 additions and 2,844 deletions.
diff --git a/api-client/src/protocols/utils.ts b/api-client/src/protocols/utils.ts
@@ -1,8 +1,7 @@
 // set of functions that parse details out of a protocol record and it's internals
 import reduce from 'lodash/reduce'
 
-import { COLORS } from '@opentrons/components/src/ui-style-constants'
-import { getLabwareDefURI } from '@opentrons/shared-data'
+import { getLabwareDefURI, DEFAULT_LIQUID_COLORS } from '@opentrons/shared-data'
 import type {
   Liquid,
   LoadedLabware,
@@ -254,7 +253,7 @@ export function parseLiquidsInLoadOrder(
       ...liquid,
       displayColor:
         liquid.displayColor ??
-        COLORS.liquidColors[index % COLORS.liquidColors.length],
+        DEFAULT_LIQUID_COLORS[index % DEFAULT_LIQUID_COLORS.length],
     }
   })