djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reapply changes after rebase

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/AppLayout/AppLayout.tsx
View file

@ -195,10 +195,9 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
isMac={navigator.platform.toLowerCase().includes("mac")} isMac={navigator.platform.toLowerCase().includes("mac")}
onClick={() => setNavigatorVisibility(true)} onClick={() => setNavigatorVisibility(true)}
/> />
{channel && ( {isPickerActive && (
<AppChannelSelect <AppChannelSelect
channels={availableChannels} channels={availableChannels}
disabled={!isPickerActive}
selectedChannelId={channel.id} selectedChannelId={channel.id}
onChannelSelect={setChannel} onChannelSelect={setChannel}
/> />

2
src/orders/views/OrderDraftList/OrderDraftList.tsx
View file

@ -81,7 +81,7 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
onCompleted: handleCreateOrderCreateSuccess onCompleted: handleCreateOrderCreateSuccess
}); });
const { channel, availableChannels } = useAppChannel(); const { channel, availableChannels } = useAppChannel(false);
const limitOpts = useShopLimitsQuery({ const limitOpts = useShopLimitsQuery({
variables: { variables: {
orders: true orders: true