reapply changes after rebase

This commit is contained in:
sektordv 2021-08-11 13:44:47 +02:00
parent e5d0ee1179
commit 049210b1b6
2 changed files with 2 additions and 3 deletions

View file

@ -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}
/>

View file

@ -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