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

Jump to bottom

fix(app): fix capitalization of ML to uL in instrument cards #14779

Merged
merged 2 commits into from
Apr 2, 2024
Merged

fix(app): fix capitalization of ML to uL in instrument cards #14779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2886c87
fix(app): fix capitalization of ML to uL in instrument cards
smb2268 Apr 2, 2024
1759a6b
Fix TS error
smb2268 Apr 2, 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
Next Next commit
fix(app): fix capitalization of ML to uL in instrument cards
  • Loading branch information
@smb2268
smb2268 committed Apr 2, 2024
commit 2886c8705973fde998ef1c9ff7d50a6182e5ad64
4 changes: 1 addition & 3 deletions app/src/molecules/InstrumentCard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ export function InstrumentCard(props: InstrumentCardProps): JSX.Element {
>
{label}
</StyledText>
<StyledText as="p" textTransform={TYPOGRAPHY.textTransformCapitalize}>
{description}
</StyledText>
<StyledText as="p">{description}</StyledText>
</Flex>
{menuOverlayItems != null && (
<Box
Expand Down
4 changes: 3 additions & 1 deletion app/src/organisms/Devices/PipetteCard/FlexPipetteCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,10 @@
{(attachedPipette == null || attachedPipette.ok) &&
subsystemUpdateData == null ? (
<InstrumentCard
description={

Check failure on line 185 in app/src/organisms/Devices/PipetteCard/FlexPipetteCard.tsx

View workflow job for this annotation

GitHub Actions / js checks 

Type 'string | undefined' is not assignable to type 'string'.

Check failure on line 185 in app/src/organisms/Devices/PipetteCard/FlexPipetteCard.tsx

View workflow job for this annotation

GitHub Actions / js checks 

Type 'string | undefined' is not assignable to type 'string'.
attachedPipette != null ? pipetteDisplayName : t('shared:empty')
attachedPipette != null
? pipetteDisplayName
: i18n.format(t('shared:empty'), 'capitalize')
}
instrumentDiagramProps={{
pipetteSpecs: pipetteModelSpecs,
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/GripperCard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export function GripperCard({
? getGripperDisplayName(
attachedGripper.instrumentModel as GripperModel
)
: t('shared:empty')
: i18n.format(t('shared:empty'), 'capitalize')
}
banner={
attachedGripper?.ok && !isCalibrated ? (
Expand Down
Loading