From 144765ff21d3d0a08b1892e1e3d2c6768b695eb6 Mon Sep 17 00:00:00 2001 From: Jamey Huffnagle Date: Mon, 5 Aug 2024 13:08:52 -0400 Subject: [PATCH] drop tip success image fixes --- .../localization/en/drop_tip_wizard.json | 4 +- .../organisms/DropTipWizardFlows/Success.tsx | 78 +++++++++++++------ 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/app/src/assets/localization/en/drop_tip_wizard.json b/app/src/assets/localization/en/drop_tip_wizard.json index 4bedd4bc8e6..fe673268a50 100644 --- a/app/src/assets/localization/en/drop_tip_wizard.json +++ b/app/src/assets/localization/en/drop_tip_wizard.json @@ -1,7 +1,7 @@ { "before_you_begin_do_you_want_to_blowout": "Before you begin, do you need to preserve aspirated liquid?", "begin_removal": "Begin removal", - "blowout_complete": "blowout complete", + "blowout_complete": "Blowout complete", "blowout_liquid": "Blow out liquid", "cant_safely_drop_tips": "Can't safely drop tips", "choose_blowout_location": "choose blowout location", @@ -9,7 +9,7 @@ "confirm_blowout_location": "Is the pipette positioned where the liquids should be blown out?", "confirm_drop_tip_location": "Is the pipette positioned where the tips should be dropped?", "confirm_removal_and_home": "Confirm removal and home", - "drop_tip_complete": "tip drop complete", + "drop_tip_complete": "Tip drop complete", "drop_tip_failed": "The drop tip could not be completed. Contact customer support for assistance.", "drop_tips": "drop tips", "error_dropping_tips": "Error dropping tips", diff --git a/app/src/organisms/DropTipWizardFlows/Success.tsx b/app/src/organisms/DropTipWizardFlows/Success.tsx index 7fb10ae9cc4..5e72dd66281 100644 --- a/app/src/organisms/DropTipWizardFlows/Success.tsx +++ b/app/src/organisms/DropTipWizardFlows/Success.tsx @@ -1,19 +1,23 @@ import * as React from 'react' -import { useTranslation } from 'react-i18next' import { - COLORS, + StyledText, PrimaryButton, TEXT_TRANSFORM_CAPITALIZE, JUSTIFY_FLEX_END, + ALIGN_CENTER, Flex, SPACING, + DIRECTION_COLUMN, + RESPONSIVENESS, + JUSTIFY_CENTER, } from '@opentrons/components' -import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' import { SmallButton } from '../../atoms/buttons' +import SuccessIcon from '../../assets/images/icon_success.png' import type { DropTipWizardContainerProps } from './types' +import { css } from 'styled-components' type SuccessProps = DropTipWizardContainerProps & { message: string @@ -29,32 +33,58 @@ export const Success = (props: SuccessProps): JSX.Element => { issuedCommandsType, } = props - const { i18n } = useTranslation(['drop_tip_wizard', 'shared']) - return ( - <> - {issuedCommandsType === 'fixit' ? : null} - + + Success Icon + + {message} + + + {isOnDevice ? ( - - - + ) : ( {proceedText} )} - - + + ) } + +const WIZARD_CONTAINER_STYLE = css` + min-height: 394px; + flex-direction: ${DIRECTION_COLUMN}; + justify-content: ${JUSTIFY_CENTER}; + @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} { + height: 472px; + } +`