fix(app): handle no step after current step edge case

Opentrons · Aug 7, 2024 · 3a1081b · 3a1081b
1 parent b314dd6
commit 3a1081b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 39 deletions.
diff --git a/app/src/molecules/Command/Command.tsx b/app/src/molecules/Command/Command.tsx
@@ -41,7 +41,6 @@ interface NonSkeletonCommandProps extends FundamentalProps {
 export type CommandProps = SkeletonCommandProps | NonSkeletonCommandProps
 
 export function Command(props: CommandProps): JSX.Element {
-  console.log('=>(Command.tsx:44) props', props)
   // This uses the dynamic function variant to work with storybook
   const isOnDevice = RESPONSIVENESS.isTouchscreenDynamic()
   return props.state === 'loading' ? (

diff --git a/app/src/molecules/Command/hooks/useCommandTextString/utils/getPipettingCommandText.ts b/app/src/molecules/Command/hooks/useCommandTextString/utils/getPipettingCommandText.ts
@@ -139,16 +139,6 @@ export const getPipettingCommandText = ({
         pipette => pipette.id === pipetteId
       )?.pipetteName
 
-      console.log('=>(getPipettingCommandText.ts:157) labwareId', labwareId)
-      console.log(
-        '=>(getPipettingCommandText.ts:161) commandTextData',
-        commandTextData
-      )
-      console.log(
-        '=>(getPipettingCommandText.ts:163) displayLocation',
-        displayLocation
-      )
-
       return t('pickup_tip', {
         well_range:
           allPreviousCommands != null

diff --git a/app/src/molecules/InterventionModal/CategorizedStepContent.tsx b/app/src/molecules/InterventionModal/CategorizedStepContent.tsx
@@ -111,35 +111,42 @@ export function CategorizedStepContent(
         justifyContent={JUSTIFY_FLEX_START}
         gap={SPACING.spacing4}
       >
-        <StyledText oddStyle="bodyTextSemiBold" desktopStyle="captionSemiBold">
-          {props.bottomCategoryHeadline}
-        </StyledText>
-        {props.bottomCategoryCommands.map((command, idx) => (
-          <Flex
-            gap={SPACING.spacing8}
-            key={`${props.bottomCategory}${
-              command?.command?.commandType ?? 'unknown'
-            }${idx}`}
-            css={idx > 0 ? HIDE_ON_TOUCHSCREEN_STYLE : undefined}
+        {props.bottomCategoryCommands[0] != null ? (
+          <StyledText
+            oddStyle="bodyTextSemiBold"
+            desktopStyle="captionSemiBold"
           >
-            <CommandIndex
-              index={`${
-                command?.index == null ? '' : command.index.toString()
-              }`}
-              allowSpaceForNDigits={maxIndexLength}
-            />
-            <Command
-              {...commandAndState(
-                command,
-                props.bottomCategory,
-                props.commandTextData
-              )}
-              robotType={props.robotType}
-              aligned="left"
-              forceTwoLineClip
-            />
-          </Flex>
-        ))}
+            {props.bottomCategoryHeadline}
+          </StyledText>
+        ) : null}
+        {props.bottomCategoryCommands.map((command, idx) => {
+          return command != null ? (
+            <Flex
+              gap={SPACING.spacing8}
+              key={`${props.bottomCategory}${
+                command?.command?.commandType ?? 'unknown'
+              }${idx}`}
+              css={idx > 0 ? HIDE_ON_TOUCHSCREEN_STYLE : undefined}
+            >
+              <CommandIndex
+                index={`${
+                  command?.index == null ? '' : command.index.toString()
+                }`}
+                allowSpaceForNDigits={maxIndexLength}
+              />
+              <Command
+                {...commandAndState(
+                  command,
+                  props.bottomCategory,
+                  props.commandTextData
+                )}
+                robotType={props.robotType}
+                aligned="left"
+                forceTwoLineClip
+              />
+            </Flex>
+          ) : null
+        })}
       </Flex>
     </Flex>
   )