From 8813209544372b263dda408d19a7cc08ccdbc05a Mon Sep 17 00:00:00 2001
From: Jethary <jethary@opentrons.com>
Date: Thu, 11 Apr 2024 12:21:58 -0400
Subject: [PATCH 1/3] fix(protocol-designer): discarding vs delete step form
 button text

closes AUTH-319
---
 protocol-designer/src/localization/en/modal.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protocol-designer/src/localization/en/modal.json b/protocol-designer/src/localization/en/modal.json
index a07cb3b1310..696ed63e247 100644
--- a/protocol-designer/src/localization/en/modal.json
+++ b/protocol-designer/src/localization/en/modal.json
@@ -169,7 +169,7 @@
     "closeUnsavedStepForm": {
       "title": "Unsaved step form",
       "body": "You have not saved this step form. If you navigate away without saving, this step will be deleted.",
-      "confirm_button": "delete step"
+      "confirm_button": "discard step"
     },
     "closeBatchEditForm": {
       "title": "Unsaved changes to multiple steps",

From 44b379129b4b98d5423eb23853894be515c0bd14 Mon Sep 17 00:00:00 2001
From: Jethary <jethary@opentrons.com>
Date: Thu, 11 Apr 2024 13:10:53 -0400
Subject: [PATCH 2/3] fix step highlight issue

---
 components/src/lists/TitledList.tsx | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/components/src/lists/TitledList.tsx b/components/src/lists/TitledList.tsx
index 58a12d19b6e..2ba9ef05c6e 100644
--- a/components/src/lists/TitledList.tsx
+++ b/components/src/lists/TitledList.tsx
@@ -2,10 +2,13 @@
 import * as React from 'react'
 import cx from 'classnames'
 
-import styles from './lists.module.css'
 import { Icon } from '../icons'
+import { StyledText } from '../atoms'
+import { COLORS } from '../helix-design-system'
 import type { IconName, IconProps } from '../icons'
 
+import styles from './lists.module.css'
+
 // TODO(bc, 2021-03-31): reconsider whether this belongs in components library
 // it is bloated with application specific functionality
 
@@ -98,6 +101,15 @@ export function TitledList(props: TitledListProps): JSX.Element {
     iconProps && iconProps.className
   )
 
+  let textColor = 'auto'
+  if (disabled) {
+    //  the below hex code is for our legacy --c-font-disabled to match other text colors
+    textColor = '#9c9c9c'
+  } else if (props.selected && !disabled) {
+    //  the below hex code is for our legacy --c-highlight to match other text colors
+    textColor = '#5fd8ee'
+  }
+
   return (
     <div
       id={id}
@@ -109,14 +121,9 @@ export function TitledList(props: TitledListProps): JSX.Element {
         {iconName && (
           <Icon {...iconProps} className={iconClass} name={iconName} />
         )}
-        <h3
-          className={cx(styles.title, {
-            [styles.title_enabled]: !(disabled || inert),
-            [styles.title_disabled]: disabled || inert,
-          })}
-        >
+        <StyledText as="h3" backgroundColor={COLORS.white} color={textColor}>
           {props.title}
-        </h3>
+        </StyledText>
         {collapsible && (
           <div
             onClick={handleCollapseToggle}

From 986ec5703c37bf2a1a9adccef1423920f81a5601 Mon Sep 17 00:00:00 2001
From: Jethary <jethary@opentrons.com>
Date: Thu, 11 Apr 2024 16:29:59 -0400
Subject: [PATCH 3/3] address comment

---
 components/src/lists/TitledList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/src/lists/TitledList.tsx b/components/src/lists/TitledList.tsx
index 2ba9ef05c6e..4fbe4ab58ee 100644
--- a/components/src/lists/TitledList.tsx
+++ b/components/src/lists/TitledList.tsx
@@ -101,7 +101,7 @@ export function TitledList(props: TitledListProps): JSX.Element {
     iconProps && iconProps.className
   )
 
-  let textColor = 'auto'
+  let textColor = ''
   if (disabled) {
     //  the below hex code is for our legacy --c-font-disabled to match other text colors
     textColor = '#9c9c9c'