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

george / fix: modal component (revert to master implementation) #10148

Merged
merged 1 commit into from
Sep 19, 2023
Merged

george / fix: modal component (revert to master implementation) #10148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...ts/modals/real-wallets-upgrade/components/modal-elements/desktop-real-wallets-upgrade.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const DesktopRealWalletsUpgrade = observer(({ wallet_upgrade_steps }: TRealWalle
width='1200px'
should_header_stick_body={false}
has_close_icon
title=' '
>
<Modal.Body className='wallet-steps'>
<WalletsUpgradeContent wallet_upgrade_steps={wallet_upgrade_steps} />
Expand Down
4 changes: 1 addition & 3 deletions packages/components/src/components/modal/modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@ const ModalElement = ({

const rendered_title = renderTitle ? renderTitle() : null;

const is_header_visible = !is_risk_warning_visible && (header || title || rendered_title || has_close_icon);

return ReactDOM.createPortal(
<div
ref={wrapper_ref}
Expand All @@ -151,7 +149,7 @@ const ModalElement = ({
minHeight: min_height || 0,
}}
>
{is_header_visible && (
{!is_risk_warning_visible && (header || title || rendered_title) && (
<div
className={classNames('dc-modal-header', {
'dc-modal-header__border-bottom': !should_header_stick_body,
Expand Down