From 912dc5d1f4da0105d0cf2df5302a8126d7ae0310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Choi=C5=84ski?= <marekchoinski17@gmail.com>
Date: Mon, 21 Dec 2020 13:46:34 +0100
Subject: [PATCH] Fix warnings (#919)

---
 .../OrderInvoiceList/OrderInvoiceList.tsx     |  6 ++--
 .../ShippingZoneDetailsPage.tsx               |  6 ++--
 .../ShippingZoneRatesPage.tsx                 |  6 ++--
 src/shipping/fixtures.ts                      | 30 +++++++++----------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
index 8a0a4ec5f..bf9a0e684 100644
--- a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
+++ b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx
@@ -27,11 +27,11 @@ const useStyles = makeStyles(
       padding: 0
     },
     colAction: {
-      padding: "0 0.5rem",
-      width: "auto",
       button: {
         padding: "0"
-      }
+      },
+      padding: "0 0.5rem",
+      width: "auto"
     },
     colNumber: { width: "100%" },
     colNumberClickable: {
diff --git a/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx b/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx
index 334184769..204ee2bdb 100644
--- a/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx
+++ b/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx
@@ -93,10 +93,10 @@ const ShippingZoneDetailsPage: React.FC<ShippingZoneDetailsPageProps> = ({
   const intl = useIntl();
 
   const initialForm: FormData = {
-    name: shippingZone?.name || "",
-    warehouses: shippingZone?.warehouses?.map(warehouse => warehouse.id) || [],
     metadata: shippingZone?.metadata.map(mapMetadataItemToInput),
-    privateMetadata: shippingZone?.privateMetadata.map(mapMetadataItemToInput)
+    name: shippingZone?.name || "",
+    privateMetadata: shippingZone?.privateMetadata.map(mapMetadataItemToInput),
+    warehouses: shippingZone?.warehouses?.map(warehouse => warehouse.id) || []
   };
   const [warehouseDisplayValues, setWarehouseDisplayValues] = useStateFromProps<
     MultiAutocompleteChoiceType[]
diff --git a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx
index 73c07eef9..1f15dcadc 100644
--- a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx
+++ b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx
@@ -90,12 +90,12 @@ export const ShippingZoneRatesPage: React.FC<ShippingZoneRatesPageProps> = ({
     channelListings: shippingChannels,
     includeZipCodes: ZipCodeInclusion.Exclude,
     maxValue: rate?.maximumOrderWeight?.value.toString() || "",
+    metadata: rate?.metadata.map(mapMetadataItemToInput),
     minValue: rate?.minimumOrderWeight?.value.toString() || "",
     name: rate?.name || "",
     noLimits: false,
-    type: rate?.type || null,
-    metadata: rate?.metadata.map(mapMetadataItemToInput),
-    privateMetadata: rate?.privateMetadata.map(mapMetadataItemToInput)
+    privateMetadata: rate?.privateMetadata.map(mapMetadataItemToInput),
+    type: rate?.type || null
   };
 
   const {
diff --git a/src/shipping/fixtures.ts b/src/shipping/fixtures.ts
index 01fb0fbe2..569384af5 100644
--- a/src/shipping/fixtures.ts
+++ b/src/shipping/fixtures.ts
@@ -265,8 +265,8 @@ export const shippingZones: ShippingZoneFragment[] = [
       }
     ],
     id: "U2hpcHBpbmdab25lOjE=",
-    name: "Europe",
     metadata: [],
+    name: "Europe",
     privateMetadata: []
   },
   {
@@ -419,8 +419,8 @@ export const shippingZones: ShippingZoneFragment[] = [
       }
     ],
     id: "U2hpcHBpbmdab25lOjI=",
-    name: "Oceania",
     metadata: [],
+    name: "Oceania",
     privateMetadata: []
   },
   {
@@ -684,8 +684,8 @@ export const shippingZones: ShippingZoneFragment[] = [
       }
     ],
     id: "U2hpcHBpbmdab25lOjM=",
-    name: "Asia",
     metadata: [],
+    name: "Asia",
     privateMetadata: []
   },
   {
@@ -979,8 +979,8 @@ export const shippingZones: ShippingZoneFragment[] = [
       }
     ],
     id: "U2hpcHBpbmdab25lOjQ=",
-    name: "Americas",
     metadata: [],
+    name: "Americas",
     privateMetadata: []
   },
   {
@@ -1290,16 +1290,14 @@ export const shippingZones: ShippingZoneFragment[] = [
       }
     ],
     id: "U2hpcHBpbmdab25lOjU=",
-    name: "Africa",
     metadata: [],
+    name: "Africa",
     privateMetadata: []
   }
 ];
 
 export const shippingZone: ShippingZone_shippingZone = {
   __typename: "ShippingZone",
-  metadata: [],
-  privateMetadata: [],
   countries: [
     {
       __typename: "CountryDisplay",
@@ -1559,12 +1557,12 @@ export const shippingZone: ShippingZone_shippingZone = {
   ],
   default: false,
   id: "U2hpcHBpbmdab25lOjE=",
+  metadata: [],
   name: "Europe",
+  privateMetadata: [],
   shippingMethods: [
     {
       __typename: "ShippingMethod",
-      metadata: [],
-      privateMetadata: [],
       channelListings: [
         {
           __typename: "ShippingMethodChannelListing",
@@ -1622,12 +1620,14 @@ export const shippingZone: ShippingZone_shippingZone = {
         unit: WeightUnitsEnum.KG,
         value: 80
       },
+      metadata: [],
       minimumOrderWeight: {
         __typename: "Weight",
         unit: WeightUnitsEnum.KG,
         value: 0
       },
       name: "DB Schenker",
+      privateMetadata: [],
       type: ShippingMethodTypeEnum.WEIGHT,
       zipCodeRules: [
         {
@@ -1652,8 +1652,6 @@ export const shippingZone: ShippingZone_shippingZone = {
     },
     {
       __typename: "ShippingMethod",
-      metadata: [],
-      privateMetadata: [],
       channelListings: [],
       excludedProducts: {
         __typename: "ProductCountableConnection",
@@ -1681,12 +1679,14 @@ export const shippingZone: ShippingZone_shippingZone = {
       },
       id: "U2hpcHBpbmdNZXRob2Q6Mw==",
       maximumOrderWeight: null,
+      metadata: [],
       minimumOrderWeight: {
         __typename: "Weight",
         unit: WeightUnitsEnum.KG,
         value: 0
       },
       name: "Registred priority",
+      privateMetadata: [],
       type: ShippingMethodTypeEnum.WEIGHT,
       zipCodeRules: [
         {
@@ -1711,8 +1711,6 @@ export const shippingZone: ShippingZone_shippingZone = {
     },
     {
       __typename: "ShippingMethod",
-      metadata: [],
-      privateMetadata: [],
       channelListings: [],
       excludedProducts: {
         __typename: "ProductCountableConnection",
@@ -1740,12 +1738,14 @@ export const shippingZone: ShippingZone_shippingZone = {
       },
       id: "U2hpcHBpbmdNZXRob2Q6Mg==",
       maximumOrderWeight: null,
+      metadata: [],
       minimumOrderWeight: {
         __typename: "Weight",
         unit: WeightUnitsEnum.KG,
         value: 0
       },
       name: "UPS",
+      privateMetadata: [],
       type: ShippingMethodTypeEnum.PRICE,
       zipCodeRules: [
         {
@@ -1784,15 +1784,15 @@ export const shippingZone: ShippingZone_shippingZone = {
       },
       id: "U2hpcHBpbmdNZXRob2Q6MQ==",
       maximumOrderWeight: null,
+      metadata: [],
       minimumOrderWeight: {
         __typename: "Weight",
         unit: WeightUnitsEnum.KG,
         value: 0
       },
       name: "DHL",
-      type: ShippingMethodTypeEnum.PRICE,
-      metadata: [],
       privateMetadata: [],
+      type: ShippingMethodTypeEnum.PRICE,
       zipCodeRules: [
         {
           __typename: "ShippingMethodZipCodeRule",