Merge branch 'main' into merx-1181-update-add-tracking-button

saleor · Jan 13, 2025 · d0fb607 · d0fb607
2 parents cc887e3 + 84f5c53
commit d0fb607
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.changeset/forty-scissors-bathe.md b/.changeset/forty-scissors-bathe.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Order sidebar now uses buttons from new macaw
diff --git a/src/orders/components/OrderCustomer/OrderCustomer.tsx b/src/orders/components/OrderCustomer/OrderCustomer.tsx
@@ -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";
@@ -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";
 
@@ -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}
               >
@@ -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}
               >
@@ -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}
               >

diff --git a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
@@ -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";
@@ -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";
 
@@ -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"