From 306160c2177a852eb02fda90d87a9cd7f080e831 Mon Sep 17 00:00:00 2001
From: sektordv <roman@sawblade.pl>
Date: Tue, 17 Aug 2021 14:26:21 +0200
Subject: [PATCH 1/2] fix component remount in shipping zone settings

---
 .../ShippingZoneSettingsCard.tsx              | 54 ++++++++-----------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx
index bd1c6dd2f..5b2ad4d81 100644
--- a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx
+++ b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx
@@ -52,38 +52,28 @@ export const ShippingZoneSettingsCard: React.FC<ShippingZoneSettingsCardProps> =
   return (
     <Card>
       <CardTitle title={intl.formatMessage(messages.title)} />
-      {loading && (
-        <CardContent>
-          <Skeleton />
-        </CardContent>
-      )}
-
-      {!loading && (
-        <>
-          <CardContent>
-            <ChannelsSection
-              channelsDisplayValues={channelsDisplayValues}
-              onChange={onChannelChange}
-              allChannels={allChannels}
-              selectedChannels={formData.channels}
-            />
-          </CardContent>
-          <Divider />
-          <CardContent>
-            <WarehousesSection
-              onAdd={onWarehouseAdd}
-              onSearchChange={onWarehousesSearchChange}
-              onChange={onWarehouseChange}
-              onFetchMore={onFetchMoreWarehouses}
-              displayValues={warehousesDisplayValues}
-              choices={warehousesChoices}
-              selectedWarehouses={formData.warehouses}
-              hasMore={hasMoreWarehouses}
-              loading={false}
-            />
-          </CardContent>
-        </>
-      )}
+      <CardContent>
+        <ChannelsSection
+          channelsDisplayValues={channelsDisplayValues}
+          onChange={onChannelChange}
+          allChannels={allChannels}
+          selectedChannels={formData.channels}
+        />
+      </CardContent>
+      <Divider />
+      <CardContent>
+        <WarehousesSection
+          onAdd={onWarehouseAdd}
+          onSearchChange={onWarehousesSearchChange}
+          onChange={onWarehouseChange}
+          onFetchMore={onFetchMoreWarehouses}
+          displayValues={warehousesDisplayValues}
+          choices={warehousesChoices}
+          selectedWarehouses={formData.warehouses}
+          hasMore={hasMoreWarehouses}
+          loading={loading}
+        />
+      </CardContent>
     </Card>
   );
 };

From 52199aee374e4bae833945244f55880450832d3c Mon Sep 17 00:00:00 2001
From: sektordv <roman@sawblade.pl>
Date: Tue, 17 Aug 2021 14:29:28 +0200
Subject: [PATCH 2/2] remove skeleton import

---
 .../ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx
index 5b2ad4d81..bb6228ea4 100644
--- a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx
+++ b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx
@@ -2,7 +2,6 @@ import { Card, CardContent, Divider } from "@material-ui/core";
 import { BaseChannels_channels } from "@saleor/channels/types/BaseChannels";
 import CardTitle from "@saleor/components/CardTitle";
 import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField";
-import Skeleton from "@saleor/components/Skeleton";
 import { FormChange } from "@saleor/hooks/useForm";
 import React from "react";
 import { defineMessages, useIntl } from "react-intl";