Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(app): fix ODD map view nick name display issue #17019

Merged
merged 2 commits into from
Dec 4, 2024
Merged

fix(app): fix ODD map view nick name display issue #17019

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
573f0de
fix(app): fix ODD map view nick name display issue
koji Dec 3, 2024
0ea11e5
address feedback from jamey and nick
koji Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/organisms/ODD/ProtocolSetup/ProtocolSetupLabware/SingleLabwareModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ export const SingleLabwareModal = (

const selectedLabwareLocation = selectedLabware?.location

const nickName =
mostRecentAnalysis?.labware.find(l => l.id === selectedLabware.id)
?.displayName ?? selectedLabware.nickName
koji marked this conversation as resolved.
Show resolved Hide resolved

return createPortal(
<OddModal onOutsideClick={onOutsideClick}>
<Flex justifyContent={JUSTIFY_SPACE_BETWEEN} width="100%">
Expand All @@ -84,7 +88,7 @@ export const SingleLabwareModal = (
{getLabwareDisplayName(selectedLabware)}
</LegacyStyledText>
<LegacyStyledText as="p" color={COLORS.grey60}>
{selectedLabware.nickName}
{nickName}
{selectedLabwareLocation != null &&
selectedLabwareLocation !== 'offDeck' &&
'labwareId' in selectedLabwareLocation
Expand Down
Loading