Skip to content

Commit db21c14

Browse files
authored
fix(app): fix UpdateAppModal style (#15149)
Closes RQA-2675
1 parent 9207ef5 commit db21c14

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

app/src/molecules/ReleaseNotes/index.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as React from 'react'
22
import Markdown from 'react-markdown'
33

4-
import { StyledText } from '@opentrons/components'
4+
import { Box, COLORS, SPACING, StyledText } from '@opentrons/components'
5+
56
import { useIsOEMMode } from '../../resources/robot-settings/hooks'
67

78
import styles from './styles.module.css'
@@ -28,6 +29,7 @@ export function ReleaseNotes(props: ReleaseNotesProps): JSX.Element {
2829
li: ListItemText,
2930
p: ParagraphText,
3031
a: ExternalLink,
32+
hr: HorizontalRule,
3133
}}
3234
>
3335
{source}
@@ -58,3 +60,13 @@ function ListItemText(props: JSX.IntrinsicAttributes): JSX.Element {
5860
function UnnumberedListText(props: JSX.IntrinsicAttributes): JSX.Element {
5961
return <StyledText {...props} as="ul" />
6062
}
63+
64+
function HorizontalRule(): JSX.Element {
65+
return (
66+
<Box
67+
borderBottom={`1px solid ${String(COLORS.grey30)}`}
68+
marginY={SPACING.spacing16}
69+
data-testid="divider"
70+
/>
71+
)
72+
}

app/src/organisms/UpdateAppModal/index.tsx

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
Flex,
1313
JUSTIFY_SPACE_AROUND,
1414
JUSTIFY_SPACE_BETWEEN,
15-
NewPrimaryBtn,
16-
NewSecondaryBtn,
15+
PrimaryButton,
16+
SecondaryButton,
1717
SPACING,
1818
StyledText,
1919
} from '@opentrons/components'
@@ -62,18 +62,7 @@ const PlaceholderError = ({
6262
export const RELEASE_NOTES_URL_BASE =
6363
'https://github.com/Opentrons/opentrons/releases/tag/v'
6464
const UPDATE_ERROR = 'Update Error'
65-
const FOOTER_BUTTON_STYLE = css`
66-
text-transform: lowercase;
67-
padding-left: ${SPACING.spacing16};
68-
padding-right: ${SPACING.spacing16};
69-
border-radius: ${BORDERS.borderRadius8};
70-
margin-top: ${SPACING.spacing16};
71-
margin-bottom: ${SPACING.spacing16};
7265

73-
&:first-letter {
74-
text-transform: uppercase;
75-
}
76-
`
7766
const UpdateAppBanner = styled(Banner)`
7867
border: none;
7968
`
@@ -122,7 +111,13 @@ export function UpdateAppModal(props: UpdateAppModalProps): JSX.Element {
122111
removeActiveAppUpdateToast()
123112

124113
const appUpdateFooter = (
125-
<Flex alignItems={ALIGN_CENTER} justifyContent={JUSTIFY_SPACE_BETWEEN}>
114+
<Flex
115+
alignItems={ALIGN_CENTER}
116+
justifyContent={JUSTIFY_SPACE_BETWEEN}
117+
paddingY={SPACING.spacing16}
118+
borderTop={BORDERS.lineBorder}
119+
borderColor={COLORS.grey30}
120+
>
126121
<ExternalLink
127122
href={`${RELEASE_NOTES_URL_BASE}${availableAppUpdateVersion}`}
128123
css={css`
@@ -134,20 +129,18 @@ export function UpdateAppModal(props: UpdateAppModalProps): JSX.Element {
134129
{t('release_notes')}
135130
</ExternalLink>
136131
<Flex alignItems={ALIGN_CENTER} justifyContent={JUSTIFY_SPACE_AROUND}>
137-
<NewSecondaryBtn
132+
<SecondaryButton
138133
onClick={handleRemindMeLaterClick}
139134
marginRight={SPACING.spacing8}
140-
css={FOOTER_BUTTON_STYLE}
141135
>
142136
{t('remind_later')}
143-
</NewSecondaryBtn>
144-
<NewPrimaryBtn
137+
</SecondaryButton>
138+
<PrimaryButton
145139
onClick={() => dispatch(downloadShellUpdate())}
146140
marginRight={SPACING.spacing12}
147-
css={FOOTER_BUTTON_STYLE}
148141
>
149142
{t('update_app_now')}
150-
</NewPrimaryBtn>
143+
</PrimaryButton>
151144
</Flex>
152145
</Flex>
153146
)

0 commit comments

Comments
 (0)