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

refactor(app): update various error recovery copy/css #16519

Merged
merged 6 commits into from
Oct 18, 2024
Merged

refactor(app): update various error recovery copy/css #16519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b98064d
update drop tip wiz copy
mjhuff Oct 17, 2024
e42e0af
Merge branch 'edge' into app_update-error-recovery-copy
mjhuff Oct 17, 2024
e8ff83f
refactor(app): perfectly align the recovery footer buttons :)
mjhuff Oct 17, 2024
041305e
refactor(app): adjust deck so it doesn't push down the continue button
mjhuff Oct 17, 2024
beb4184
refactor(app): desktop intervention modal padding = desktop "generic"…
mjhuff Oct 17, 2024
a5f1e68
update failing test
mjhuff Oct 17, 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
2 changes: 1 addition & 1 deletion app/src/assets/localization/en/drop_tip_wizard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
"waste_chute_in_slot": "Waste chute in {{slot}}",
"where_to_blowout": "Where do you want to blow out the aspirated liquid?",
"where_to_drop_tips": "Where do you want to drop the attached tips?",
"yes_blow_out_liquid": "Yes, blow out liquid in labware"
"yes_blow_out_liquid": "Yes, choose blowout location"
}
2 changes: 1 addition & 1 deletion app/src/assets/localization/en/error_recovery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"overpressure_is_usually_caused": "Overpressure is usually caused by a tip contacting labware, a clog, or moving viscous liquid too quickly",
"pick_up_tips": "Pick up tips",
"pipette_overpressure": "Pipette overpressure",
"preserve_aspirated_liquid": "First, do you need to preserve aspirated liquid?",
"do_you_need_to_blowout": "First, do you need to blowout aspirated liquid?",
"proceed_to_cancel": "Proceed to cancel",
"proceed_to_tip_selection": "Proceed to tip selection",
"recovery_action_failed": "{{action}} failed",
Expand Down
1 change: 1 addition & 0 deletions app/src/molecules/InterventionModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const BASE_STYLE = {
right: 0,
bottom: 0,
left: 0,
padding: '1rem',
width: '100%',
height: '100%',
'data-testid': '__otInterventionModalHeaderBase',
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export function useDropTipFlowUtils({
const buildCopyOverrides = (): FixitCommandTypeUtils['copyOverrides'] => {
return {
tipDropCompleteBtnCopy: buildTipDropCompleteBtn(),
beforeBeginningTopText: t('preserve_aspirated_liquid'),
beforeBeginningTopText: t('do_you_need_to_blowout'),
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/__tests__/ManageTips.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ describe('useDropTipFlowUtils', () => {

testingRender(result.current.copyOverrides.beforeBeginningTopText as any)

screen.getByText('First, do you need to preserve aspirated liquid?')
screen.getByText('First, do you need to blowout aspirated liquid?')

testingRender(result.current.copyOverrides.tipDropCompleteBtnCopy as any)

Expand Down
16 changes: 8 additions & 8 deletions app/src/organisms/ErrorRecoveryFlows/shared/RecoveryFooterButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ export function RecoveryFooterButtons(
alignItems={ALIGN_FLEX_END}
gridGap={SPACING.spacing8}
>
{!props.secondaryAsTertiary && <RecoveryGoBackButton {...props} />}
<PrimaryButtonGroup {...props} />
<Flex justifyContent={JUSTIFY_SPACE_BETWEEN} width="100%">
{!props.secondaryAsTertiary && <RecoveryGoBackButton {...props} />}
<PrimaryButtonGroup {...props} />
</Flex>
</Flex>
)
}
Expand All @@ -57,12 +59,10 @@ function RecoveryGoBackButton({
const showGoBackBtn = secondaryBtnOnClick != null
const { t } = useTranslation('error_recovery')
return showGoBackBtn ? (
<Flex>
<TextOnlyButton
onClick={secondaryBtnOnClick}
buttonText={secondaryBtnTextOverride ?? t('go_back')}
/>
</Flex>
<TextOnlyButton
onClick={secondaryBtnOnClick}
buttonText={secondaryBtnTextOverride ?? t('go_back')}
/>
) : (
<Box />
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/ErrorRecoveryFlows/shared/TwoColLwInfoAndDeck.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export function TwoColLwInfoAndDeck(
type={buildType()}
bannerText={buildBannerText()}
/>
<Flex marginTop="1.742rem">
<Flex marginTop="0.7rem">
<DeckMapContent {...deckMapUtils} />
</Flex>
</TwoColumn>
Expand Down
Loading