reapply changes after rebase
This commit is contained in:
parent
e5d0ee1179
commit
049210b1b6
2 changed files with 2 additions and 3 deletions
|
@ -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}
|
||||
/>
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue