fix(frontend): resolve file conflicts

This commit is contained in:
yassinedorbozgithub
2025-02-08 10:58:35 +01:00
21 changed files with 1009 additions and 907 deletions

View File

@@ -22,16 +22,20 @@ export const FormDialog = ({
...rest
}: FormDialogProps) => {
const onCancel = () => rest.onClose?.({}, "backdropClick");
const dialogActions =
rest.hasButtons === false ? null : (
<DialogActions style={{ padding: "0.5rem" }}>
<DialogFormButtons
{...{ onSubmit, onCancel, confirmButtonProps, cancelButtonProps }}
/>
</DialogActions>
);
return (
<Dialog fullWidth {...rest}>
<DialogTitle onClose={onCancel}>{title}</DialogTitle>
<DialogContent>{children}</DialogContent>
<DialogActions>
<DialogFormButtons
{...{ onSubmit, onCancel, confirmButtonProps, cancelButtonProps }}
/>
</DialogActions>
{dialogActions}
</Dialog>
);
};