Skip to content

Use a new macaw button in order right sidebar #5345

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

Merged
andrzejewsky merged 2 commits into from
Jan 13, 2025
Merged

Use a new macaw button in order right sidebar #5345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9bc6c
Use a new macaw button in order right sidebar
Jan 9, 2025
e7fcab6
Add changeset
Jan 9, 2025
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/forty-scissors-bathe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Order sidebar now uses buttons from new macaw
9 changes: 4 additions & 5 deletions src/orders/components/OrderCustomer/OrderCustomer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// @ts-strict-ignore
import AddressFormatter from "@dashboard/components/AddressFormatter";
import { Button } from "@dashboard/components/Button";
import { DashboardCard } from "@dashboard/components/Card";
import { Combobox } from "@dashboard/components/Combobox";
import ExternalLink from "@dashboard/components/ExternalLink";
Expand All @@ -20,7 +19,7 @@ import { buttonMessages } from "@dashboard/intl";
import { orderListUrlWithCustomer } from "@dashboard/orders/urls";
import { FetchMoreProps, RelayToFlat } from "@dashboard/types";
import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler";
import { Skeleton, Text } from "@saleor/macaw-ui-next";
import { Button, Skeleton, Text } from "@saleor/macaw-ui-next";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";

Expand Down Expand Up @@ -98,7 +97,7 @@ const OrderCustomer: React.FC<OrderCustomerProps> = props => {
<RequirePermissions requiredPermissions={[PermissionEnum.MANAGE_ORDERS]}>
<Button
data-test-id="edit-customer"
variant="tertiary"
variant="secondary"
disabled={!onCustomerEdit}
onClick={toggleEditMode}
>
Expand Down Expand Up @@ -247,7 +246,7 @@ const OrderCustomer: React.FC<OrderCustomerProps> = props => {
<div>
<Button
data-test-id="edit-shipping-address"
variant="tertiary"
variant="secondary"
onClick={onShippingAddressEdit}
disabled={!onShippingAddressEdit && user === undefined}
>
Expand Down Expand Up @@ -288,7 +287,7 @@ const OrderCustomer: React.FC<OrderCustomerProps> = props => {
<div>
<Button
data-test-id="edit-billing-address"
variant="tertiary"
variant="secondary"
onClick={onBillingAddressEdit}
disabled={!onBillingAddressEdit && user === undefined}
>
Expand Down
5 changes: 2 additions & 3 deletions src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// @ts-strict-ignore
import { Button } from "@dashboard/components/Button";
import { DashboardCard } from "@dashboard/components/Card";
import Date from "@dashboard/components/Date";
import ResponsiveTable from "@dashboard/components/ResponsiveTable";
Expand All @@ -8,7 +7,7 @@ import { InvoiceFragment } from "@dashboard/graphql";
import { buttonMessages } from "@dashboard/intl";
import { TableBody, TableCell } from "@material-ui/core";
import { makeStyles } from "@saleor/macaw-ui";
import { Skeleton, sprinkles, Text } from "@saleor/macaw-ui-next";
import { Button, Skeleton, Text } from "@saleor/macaw-ui-next";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";

Expand Down Expand Up @@ -64,7 +63,7 @@ const OrderInvoiceList: React.FC<OrderInvoiceListProps> = props => {
</DashboardCard.Title>
<DashboardCard.Toolbar>
{onInvoiceGenerate && (
<Button onClick={onInvoiceGenerate} className={sprinkles({ marginRight: 0.5 })}>
<Button variant="secondary" onClick={onInvoiceGenerate}>
<FormattedMessage
id="e0RKe+"
defaultMessage="Generate"
Expand Down
Loading