Merge branch 'dev' into staging

This commit is contained in:
Vins 2024-06-20 10:16:00 +02:00
commit c4cf9974cb
2 changed files with 38 additions and 39 deletions

View File

@ -26,7 +26,7 @@ export default class Newsletter extends React.Component<IProps, IState> {
email: "", email: "",
errorMessage: "", errorMessage: "",
successMessage: "", successMessage: "",
isNewsletterOpen: false, isNewsletterOpen: this.props.isOpen ?? false,
}; };
} }
@ -60,8 +60,7 @@ export default class Newsletter extends React.Component<IProps, IState> {
public override render(): JSX.Element { public override render(): JSX.Element {
return ( return (
<> <>
{this.state.isNewsletterOpen || {this.state.isNewsletterOpen && (
(this.props.isOpen && (
<div className={classes["container"]}> <div className={classes["container"]}>
<div className={classes["root"]}> <div className={classes["root"]}>
<div className={classes["text"]}> <div className={classes["text"]}>
@ -99,7 +98,7 @@ export default class Newsletter extends React.Component<IProps, IState> {
</div> </div>
</div> </div>
</div> </div>
))} )}
<div className={classes["container-icon"]}> <div className={classes["container-icon"]}>
<div className={classes["newsletter"]}> <div className={classes["newsletter"]}>

View File

@ -231,7 +231,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
<Typography typo={ITypo.P_16}>Cette action sera irréversible.</Typography> <Typography typo={ITypo.P_16}>Cette action sera irréversible.</Typography>
</div> </div>
</Confirm> </Confirm>
<Newsletter /> <Newsletter isOpen={false} />
</div> </div>
) : ( ) : (
<div className={classes["no-folder-selected"]}> <div className={classes["no-folder-selected"]}>