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): update air gap aspirate copy, high res mag block image #16890

Merged
merged 2 commits into from
Nov 19, 2024
+5 −5
Merged

fix(app): update air gap aspirate copy, high res mag block image #16890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
504b098
fix(app): update air gap aspirate copy
smb2268 Nov 19, 2024
ce7ba60
fix(app): add high res mag block image
smb2268 Nov 19, 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
Binary file added app/src/assets/images/magnetic_block_gen_1@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/assets/localization/en/quick_transfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"advanced_setting_disabled": "Advanced setting disabled for this transfer",
"advanced_settings": "Advanced settings",
"air_gap": "Air gap",
"air_gap_before_aspirating": "Air gap before aspirating",
"air_gap_after_aspirating": "Air gap after aspirating",
"air_gap_before_dispensing": "Air gap before dispensing",
"air_gap_capacity_error": "The tip is too full to add an air gap.",
"air_gap_value": "{{volume}} µL",
Expand Down
1 change: 0 additions & 1 deletion app/src/assets/localization/zh/quick_transfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"add_or_remove": "添加或移除",
"advanced_setting_disabled": "此移液的高级设置已禁用",
"advanced_settings": "高级设置",
"air_gap_before_aspirating": "在吸液前设置空气间隙",
"air_gap_before_dispensing": "在分液前设置空气间隙",
"air_gap_capacity_error": "移液器空间已满，无法添加空气间隙。",
"air_gap_value": "{{volume}} µL",
Expand Down
3 changes: 2 additions & 1 deletion app/src/local-resources/modules/utils/getModuleImage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import thermoModuleGen1HighRes from '/app/assets/images/modules/thermocyclerModu
import heaterShakerModuleHighRes from '/app/assets/images/modules/heaterShakerModuleV1@3x.png'
import thermoModuleGen2 from '/app/assets/images/thermocycler_gen_2_closed.png'
import magneticBlockGen1 from '/app/assets/images/magnetic_block_gen_1.png'
import magneticBlockGen1HighRes from '/app/assets/images/magnetic_block_gen_1@3x.png'
import absorbanceReader from '/app/assets/images/opentrons_plate_reader.png'

import type { ModuleModel } from '@opentrons/shared-data'
Expand All @@ -30,7 +31,7 @@ export function getModuleImage(
case 'thermocyclerModuleV2':
return thermoModuleGen2
case 'magneticBlockV1':
return magneticBlockGen1
return highRes ? magneticBlockGen1HighRes : magneticBlockGen1
case 'absorbanceReaderV1':
return absorbanceReader
default:
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/AirGap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export function AirGap(props: AirGapProps): JSX.Element {
<ChildNavigation
header={
kind === 'aspirate'
? t('air_gap_before_aspirating')
? t('air_gap_after_aspirating')
: t('air_gap_before_dispensing')
}
buttonText={i18n.format(setSaveOrContinueButtonText, 'capitalize')}
Expand Down
2 changes: 1 addition & 1 deletion ...c/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/AirGap.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('AirGap', () => {

it('renders the first air gap screen, continue, and back buttons', () => {
render(props)
screen.getByText('Air gap before aspirating')
screen.getByText('Air gap after aspirating')
screen.getByTestId('ChildNavigation_Primary_Button')
screen.getByText('Enabled')
screen.getByText('Disabled')
Expand Down
Loading