From 049210b1b603a84b155f28d331c21400f47a8238 Mon Sep 17 00:00:00 2001
From: sektordv <roman@sawblade.pl>
Date: Wed, 11 Aug 2021 13:44:47 +0200
Subject: [PATCH] reapply changes after rebase

---
 src/components/AppLayout/AppLayout.tsx             | 3 +--
 src/orders/views/OrderDraftList/OrderDraftList.tsx | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx
index eff93ddcd..2aeeefa05 100644
--- a/src/components/AppLayout/AppLayout.tsx
+++ b/src/components/AppLayout/AppLayout.tsx
@@ -195,10 +195,9 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
                         isMac={navigator.platform.toLowerCase().includes("mac")}
                         onClick={() => setNavigatorVisibility(true)}
                       />
-                      {channel && (
+                      {isPickerActive && (
                         <AppChannelSelect
                           channels={availableChannels}
-                          disabled={!isPickerActive}
                           selectedChannelId={channel.id}
                           onChannelSelect={setChannel}
                         />
diff --git a/src/orders/views/OrderDraftList/OrderDraftList.tsx b/src/orders/views/OrderDraftList/OrderDraftList.tsx
index 87c777a16..778e7a240 100644
--- a/src/orders/views/OrderDraftList/OrderDraftList.tsx
+++ b/src/orders/views/OrderDraftList/OrderDraftList.tsx
@@ -81,7 +81,7 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
     onCompleted: handleCreateOrderCreateSuccess
   });
 
-  const { channel, availableChannels } = useAppChannel();
+  const { channel, availableChannels } = useAppChannel(false);
   const limitOpts = useShopLimitsQuery({
     variables: {
       orders: true