m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

Merge pull request #6968 from MetaMask/prevent-hidden-popup-overlay

Browse Source 
Prevent hidden popup overlay
This commit is contained in:
Thomas Huang 2019-08-06 12:50:16 -07:00 committed by GitHub
commit f679b58fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/components/app/multiple-notifications/index.scss
View File

@ -3,7 +3,6 @@
display: flex;
flex-direction: column;
width: 472px;
height: 116px;
position: absolute;
bottom: 0;
right: 0;
@ -37,7 +36,6 @@
}
.home-notification-wrapper--show-all {
height: 356px;;
justify-content: flex-end;
margin-bottom: 0;

32
ui/app/components/app/multiple-notifications/multiple-notifications.component.js
View File

@ -18,21 +18,27 @@ export default class MultipleNotifications extends PureComponent {
const notificationsToBeRendered = notifications.filter(notificationConfig => notificationConfig.shouldBeRendered)
return (<div
className={classnames(...classNames, {
'home-notification-wrapper--show-all': showAll,
'home-notification-wrapper--show-first': !showAll,
})}
>
{ notificationsToBeRendered.map(notificationConfig => notificationConfig.component) }
if (notificationsToBeRendered.length === 0) {
return null
}
return (
<div
className="home-notification-wrapper__i-container"
onClick={() => this.setState({ showAll: !showAll })}
className={classnames(...classNames, {
'home-notification-wrapper--show-all': showAll,
'home-notification-wrapper--show-first': !showAll,
})}
>
{notificationsToBeRendered.length > 1 ? <i className={classnames('fa fa-sm fa-sort-amount-asc', {
'flipped': !showAll,
})} /> : null}
{ notificationsToBeRendered.map(notificationConfig => notificationConfig.component) }
<div
className="home-notification-wrapper__i-container"
onClick={() => this.setState({ showAll: !showAll })}
>
{notificationsToBeRendered.length > 1 ? <i className={classnames('fa fa-sm fa-sort-amount-asc', {
'flipped': !showAll,
})} /> : null}
</div>
</div>
</div>)
)
}
}