-
Notifications
You must be signed in to change notification settings - Fork 180
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.
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
refactor(app): are you sure you want to cancel modal on desktop app #15662
refactor(app): are you sure you want to cancel modal on desktop app #15662
Conversation
app/src/organisms/ErrorRecoveryFlows/shared/RecoveryContentWrapper.tsx
Outdated
Show resolved
Hide resolved
app/src/organisms/ErrorRecoveryFlows/shared/ErrorDetailsModal.tsx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- some code-style stuff
- Instead of making these changes to
LegacyStyledText
, we should switch uses toStyledText
. See the inline review for more details.
app/src/organisms/ErrorRecoveryFlows/shared/ErrorDetailsModal.tsx
Outdated
Show resolved
Hide resolved
app/src/organisms/ErrorRecoveryFlows/shared/ErrorDetailsModal.tsx
Outdated
Show resolved
Hide resolved
@@ -226,7 +226,7 @@ describe('StyledText', () => { | |||
children: 'h3Bold', | |||
} | |||
render(props) | |||
expect(screen.getByText('h3Bold')).toHaveStyle( | |||
expect(screen.queryAllByText('h3Bold')[0]).toHaveStyle( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We generally prefer when rendering only one element for the sake of clarity.
expect(screen.queryAllByText('h3Bold')[0]).toHaveStyle( | |
expect(screen.getByText('h3Bold')).toHaveStyle( |
@@ -243,7 +243,7 @@ describe('StyledText', () => { | |||
children: 'h4Bold', | |||
} | |||
render(props) | |||
expect(screen.getByText('h4Bold')).toHaveStyle( | |||
expect(screen.queryAllByText('h4Bold')[0]).toHaveStyle( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expect(screen.queryAllByText('h4Bold')[0]).toHaveStyle( | |
expect(screen.getByText('h4Bold')).toHaveStyle( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we sure we want to be changing the typography file? We really shouldn't be touching this unless design tells us to, but I could be missing something.
app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/CancelRun.tsx
Outdated
Show resolved
Hide resolved
app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx
Outdated
Show resolved
Hide resolved
app/src/organisms/ErrorRecoveryFlows/RecoveryOptions/ManageTips.tsx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…s.tsx Co-authored-by: Jamey Huffnagle <[email protected]>
Co-authored-by: Jamey Huffnagle <[email protected]>
Co-authored-by: Jamey Huffnagle <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will test further, but definitely need to remove all changes to LegacyStyledText.tsx
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great! LGTM once it passes checks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's still a couple CSS issues:
- The font color on the cancel run subtext is not
black90
. - The text isn't centered on the modal.
That being said, I don't think this is blocking. We can circle up and do touch-ups later. Thank you!
Overview
closes https://opentrons.atlassian.net/browse/EXEC-553.
wire up "are you sure you want to cancel?" desktop ER modal.
Test Plan
Changelog
Mainly change style to support ODD and Desktop apps.
Risk assessment
low.