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

Improve UI of add manual transaction modal #4977

Merged
merged 3 commits into from
Jun 28, 2024
Merged

Improve UI of add manual transaction modal #4977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c8d538
Migrate to new modal
Droniu Jun 27, 2024
80a2ba7
Ad changeset
Droniu Jun 27, 2024
b239e52
Merge branch 'main' into merx-563-wrong-button-style-in-manual-transa…
Droniu Jun 27, 2024
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
5 changes: 5 additions & 0 deletions .changeset/calm-mice-stare.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Manual transaction modal has now improved design that matches other modals.
74 changes: 26 additions & 48 deletions src/orders/components/OrderManualTransactionDialog/OrderManualTransactionDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// @ts-strict-ignore
import BackButton from "@dashboard/components/BackButton";
import { DashboardModal } from "@dashboard/components/Modal";
import { commonMessages } from "@dashboard/intl";
import { DialogProps } from "@dashboard/types";
import {
Dialog,
DialogActions,
DialogContent,
DialogContentText,
DialogTitle,
} from "@material-ui/core";
import { makeStyles } from "@saleor/macaw-ui";
import { Text } from "@saleor/macaw-ui-next";
import { Box, Text } from "@saleor/macaw-ui-next";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";

Expand All @@ -20,20 +12,6 @@ import {
} from "../OrderManualTransactionForm";
import { manualTransactionMessages } from "./messages";

const useStyles = makeStyles(
theme => ({
form: {
display: "contents",
},
formWrapper: {
display: "flex",
flexDirection: "column",
gap: theme.spacing(2),
},
}),
{ name: "OrderManualTransactionDialog" },
);

type OrderManualTransactionDialogProps = {
dialogProps: DialogProps;
} & OrderManualTransactionFormProps;
Expand All @@ -43,23 +21,22 @@ export const OrderManualTransactionDialog: React.FC<OrderManualTransactionDialog
...props
}) => {
const intl = useIntl();
const classes = useStyles();
const { onClose } = dialogProps;

return (
<OrderManualTransactionForm {...props}>
<Dialog onClose={onClose} {...dialogProps} fullWidth maxWidth="xs">
<DialogTitle>
<Text size={5} fontWeight="bold">
<DashboardModal {...dialogProps}>
<DashboardModal.Content __width={"400px"}>
<DashboardModal.Title display="flex" justifyContent="space-between" alignItems="center">
<FormattedMessage {...manualTransactionMessages.dialogTitle} />
</Text>
</DialogTitle>
<OrderManualTransactionForm.Form className={classes.form}>
<DialogContent>
<DialogContentText>
<FormattedMessage {...manualTransactionMessages.dialogDescription} />
</DialogContentText>
<div className={classes.formWrapper}>
<DashboardModal.Close onClose={onClose} />
</DashboardModal.Title>

<OrderManualTransactionForm.Form>
<Box display="flex" flexDirection="column" gap={4}>
<Text size={2}>
<FormattedMessage {...manualTransactionMessages.dialogDescription} />
</Text>
<OrderManualTransactionForm.DescriptionField
label={intl.formatMessage(commonMessages.description)}
fullWidth
Expand All @@ -72,19 +49,20 @@ export const OrderManualTransactionDialog: React.FC<OrderManualTransactionDialog
label={intl.formatMessage(manualTransactionMessages.transactionAmount)}
/>
<OrderManualTransactionForm.ErrorText />
</div>
</DialogContent>
<DialogActions>
<BackButton onClick={onClose} />

<OrderManualTransactionForm.SubmitButton size="medium">
<Text fontWeight="medium" color="buttonDefaultPrimary">
<FormattedMessage {...manualTransactionMessages.submitButton} />
</Text>
</OrderManualTransactionForm.SubmitButton>
</DialogActions>
</OrderManualTransactionForm.Form>
</Dialog>
<DashboardModal.Actions>
<BackButton onClick={onClose} />

<OrderManualTransactionForm.SubmitButton size="medium">
<Text fontWeight="medium" color="buttonDefaultPrimary">
<FormattedMessage {...manualTransactionMessages.submitButton} />
</Text>
</OrderManualTransactionForm.SubmitButton>
</DashboardModal.Actions>
</Box>
</OrderManualTransactionForm.Form>
</DashboardModal.Content>
</DashboardModal>
</OrderManualTransactionForm>
);
};
Loading