From 3732a7ba68fb14f9e6b09c8d8707fdfa05fb3a89 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 21 Oct 2019 16:46:12 +0200
Subject: [PATCH 1/2] Use back instead of cancel

---
 .../AttributeValueEditDialog/AttributeValueEditDialog.tsx       | 2 +-
 .../components/CategoryDeleteDialog/CategoryDeleteDialog.tsx    | 2 +-
 src/components/AssignCategoryDialog/AssignCategoryDialog.tsx    | 2 +-
 .../AssignCollectionDialog/AssignCollectionDialog.tsx           | 2 +-
 src/components/AssignProductDialog/AssignProductDialog.tsx      | 2 +-
 src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx      | 2 +-
 .../components/CustomerAddressDialog/CustomerAddressDialog.tsx  | 2 +-
 .../DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx | 2 +-
 src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx | 2 +-
 src/navigation/components/MenuItemDialog/MenuItemDialog.tsx     | 2 +-
 .../OrderAddressEditDialog/OrderAddressEditDialog.tsx           | 2 +-
 .../OrderFulfillmentDialog/OrderFulfillmentDialog.tsx           | 2 +-
 .../OrderFulfillmentTrackingDialog.tsx                          | 2 +-
 src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx | 2 +-
 .../components/OrderProductAddDialog/OrderProductAddDialog.tsx  | 2 +-
 .../OrderShippingMethodEditDialog.tsx                           | 2 +-
 .../components/AssignAttributeDialog/AssignAttributeDialog.tsx  | 2 +-
 .../ProductTypeAttributeEditDialog.tsx                          | 2 +-
 .../ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx   | 2 +-
 .../ServiceTokenCreateDialog/ServiceTokenCreateDialog.tsx       | 2 +-
 .../ShippingZoneCountriesAssignDialog.tsx                       | 2 +-
 .../ShippingZoneRateDialog/ShippingZoneRateDialog.tsx           | 2 +-
 .../components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx  | 2 +-
 .../components/StaffAddMemberDialog/StaffAddMemberDialog.tsx    | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx b/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx
index c54150edd..92efb502a 100644
--- a/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx
+++ b/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx
@@ -83,7 +83,7 @@ const AttributeValueEditDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}
diff --git a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx
index 7cb5b8aba..df277c317 100644
--- a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx
+++ b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx
@@ -56,7 +56,7 @@ const CategoryDeleteDialog = withStyles(styles, {
     </DialogContent>
     <DialogActions>
       <Button onClick={onClose}>
-        <FormattedMessage {...buttonMessages.cancel} />
+        <FormattedMessage {...buttonMessages.back} />
       </Button>
       <Button
         className={classes.deleteButton}
diff --git a/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx b/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx
index 257b7a941..f45196049 100644
--- a/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx
+++ b/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx
@@ -161,7 +161,7 @@ const AssignCategoriesDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}
diff --git a/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx b/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx
index 16c4e52e7..f0e011c70 100644
--- a/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx
+++ b/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx
@@ -162,7 +162,7 @@ const AssignCollectionDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}
diff --git a/src/components/AssignProductDialog/AssignProductDialog.tsx b/src/components/AssignProductDialog/AssignProductDialog.tsx
index d52de901d..fff198a2e 100644
--- a/src/components/AssignProductDialog/AssignProductDialog.tsx
+++ b/src/components/AssignProductDialog/AssignProductDialog.tsx
@@ -174,7 +174,7 @@ const AssignProductDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}
diff --git a/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx b/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx
index 2527fdae6..a75f282a7 100644
--- a/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx
+++ b/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx
@@ -71,7 +71,7 @@ const SaveFilterTabDialog: React.FC<SaveFilterTabDialogProps> = ({
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}
diff --git a/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx b/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx
index 6ae1cc938..b77002e71 100644
--- a/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx
+++ b/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx
@@ -122,7 +122,7 @@ const CustomerAddressDialog = withStyles(styles, {})(
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}
diff --git a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx
index 6a4556f54..645924c05 100644
--- a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx
+++ b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx
@@ -176,7 +176,7 @@ const DiscountCountrySelectDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}
diff --git a/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx b/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx
index 478e953a2..2de0f1611 100644
--- a/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx
+++ b/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx
@@ -67,7 +67,7 @@ const MenuCreateDialog: React.FC<MenuCreateDialogProps> = ({
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}
diff --git a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx
index e4e5aeb4f..1d68ea63d 100644
--- a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx
+++ b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx
@@ -289,7 +289,7 @@ const MenuItemDialog: React.StatelessComponent<MenuItemDialogProps> = ({
       </DialogContent>
       <DialogActions>
         <Button onClick={onClose}>
-          <FormattedMessage {...buttonMessages.cancel} />
+          <FormattedMessage {...buttonMessages.back} />
         </Button>
         <ConfirmButton
           transitionState={confirmButtonState}
diff --git a/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx b/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx
index b79f0777f..ba084169f 100644
--- a/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx
+++ b/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx
@@ -103,7 +103,7 @@ const OrderAddressEditDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}
diff --git a/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx b/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx
index 12541335f..7cc07467d 100644
--- a/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx
+++ b/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx
@@ -203,7 +203,7 @@ const OrderFulfillmentDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}
diff --git a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
index 0bfa43ab8..c1633df32 100644
--- a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
+++ b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
@@ -54,7 +54,7 @@ const OrderFulfillmentTrackingDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}
diff --git a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx
index a87536796..fd1e49566 100644
--- a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx
+++ b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx
@@ -79,7 +79,7 @@ const OrderPaymentDialog: React.StatelessComponent<OrderPaymentDialogProps> = ({
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}
diff --git a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx
index f96fed5b5..c4d4b789e 100644
--- a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx
+++ b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx
@@ -328,7 +328,7 @@ const OrderProductAddDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}
diff --git a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
index ab0d86ef7..7c2ad2dcf 100644
--- a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
+++ b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
@@ -104,7 +104,7 @@ const OrderShippingMethodEditDialog = withStyles(styles, {
               </DialogContent>
               <DialogActions>
                 <Button onClick={onClose}>
-                  <FormattedMessage {...buttonMessages.cancel} />
+                  <FormattedMessage {...buttonMessages.back} />
                 </Button>
                 <ConfirmButton
                   transitionState={confirmButtonState}
diff --git a/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx b/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx
index 9c0b05463..6fd202086 100644
--- a/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx
+++ b/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx
@@ -181,7 +181,7 @@ const AssignAttributeDialog: React.FC<AssignAttributeDialogProps> = ({
       )}
       <DialogActions>
         <Button onClick={onClose}>
-          <FormattedMessage {...buttonMessages.cancel} />
+          <FormattedMessage {...buttonMessages.back} />
         </Button>
         <ConfirmButton
           transitionState={confirmButtonState}
diff --git a/src/productTypes/components/ProductTypeAttributeEditDialog/ProductTypeAttributeEditDialog.tsx b/src/productTypes/components/ProductTypeAttributeEditDialog/ProductTypeAttributeEditDialog.tsx
index 00e1b7f63..ec1128b72 100644
--- a/src/productTypes/components/ProductTypeAttributeEditDialog/ProductTypeAttributeEditDialog.tsx
+++ b/src/productTypes/components/ProductTypeAttributeEditDialog/ProductTypeAttributeEditDialog.tsx
@@ -90,7 +90,7 @@ const ProductTypeAttributeEditDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <Button color="primary" variant="contained" type="submit">
                 <FormattedMessage {...buttonMessages.confirm} />
diff --git a/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx b/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx
index aa2d8b821..feea12b9f 100644
--- a/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx
+++ b/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx
@@ -69,7 +69,7 @@ const ProductVariantDeleteDialog = withStyles(styles, {
       </DialogContent>
       <DialogActions>
         <Button onClick={onClose}>
-          <FormattedMessage {...buttonMessages.cancel} />
+          <FormattedMessage {...buttonMessages.back} />
         </Button>
         <ConfirmButton
           transitionState={confirmButtonState}
diff --git a/src/services/components/ServiceTokenCreateDialog/ServiceTokenCreateDialog.tsx b/src/services/components/ServiceTokenCreateDialog/ServiceTokenCreateDialog.tsx
index 20bb867f2..40d065b85 100644
--- a/src/services/components/ServiceTokenCreateDialog/ServiceTokenCreateDialog.tsx
+++ b/src/services/components/ServiceTokenCreateDialog/ServiceTokenCreateDialog.tsx
@@ -134,7 +134,7 @@ const ServiceTokenCreateDialog: React.FC<
                     color="primary"
                     onClick={onClose}
                   >
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}
diff --git a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx
index 0cc4bc372..bea0d3879 100644
--- a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx
+++ b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx
@@ -214,7 +214,7 @@ const ShippingZoneCountriesAssignDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}
diff --git a/src/shipping/components/ShippingZoneRateDialog/ShippingZoneRateDialog.tsx b/src/shipping/components/ShippingZoneRateDialog/ShippingZoneRateDialog.tsx
index f3e88d8f4..8fc583c73 100644
--- a/src/shipping/components/ShippingZoneRateDialog/ShippingZoneRateDialog.tsx
+++ b/src/shipping/components/ShippingZoneRateDialog/ShippingZoneRateDialog.tsx
@@ -327,7 +327,7 @@ const ShippingZoneRateDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     disabled={disabled || !hasChanged}
diff --git a/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx b/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx
index 73545589b..ac5d4666b 100644
--- a/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx
+++ b/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx
@@ -89,7 +89,7 @@ const SiteSettingsKeyDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <Button color="primary" type="submit" variant="contained">
                 <FormattedMessage
diff --git a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx
index c382c7274..054ec83fb 100644
--- a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx
+++ b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx
@@ -141,7 +141,7 @@ const StaffAddMemberDialog = withStyles(styles, {
               </DialogContent>
               <DialogActions>
                 <Button onClick={onClose}>
-                  <FormattedMessage {...buttonMessages.cancel} />
+                  <FormattedMessage {...buttonMessages.back} />
                 </Button>
                 <ConfirmButton
                   color="primary"

From e6840ba107c3608d8a49ed3b1d40ae70887676f7 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 21 Oct 2019 16:48:15 +0200
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c5323ec5..323fc2dba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,3 +41,4 @@ All notable, unreleased changes to this project will be documented in this file.
 - Improve autocomplete UX - #212 by @dominik-zeglen
 - Fix empty attribute values - #218 by @dominik-zeglen
 - Add language switch - #213 by @dominik-zeglen
+- Fix copy - #223, #224 by @dominik-zeglen