From 3194654bf1fe44122303bea481c79f63d0cfe85c Mon Sep 17 00:00:00 2001
From: SektorDV <35644259+SektorDV@users.noreply.github.com>
Date: Mon, 23 Aug 2021 11:16:35 +0200
Subject: [PATCH] Disable shipping dialog confirm button when no items selected
 (#1304)

---
 CHANGELOG.md                                                 | 2 ++
 package-lock.json                                            | 2 +-
 package.json                                                 | 2 +-
 .../OrderShippingMethodEditDialog.tsx                        | 5 ++++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 439ecd6cb..f0011065f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,8 @@ All notable, unreleased changes to this project will be documented in this file.
 - Add service worker - #1073 by @dominik-zeglen
 - Choosing user shipping and billing addresses for draft order - #1082 by @orzechdev
 - Fix EditorJS inline formatting - #1096 by @orzechdev
+- Add product / page delete warning - #1095 by @mmarkusik
+- Channels per plugin - #1093 by @mmarkusik
 - Add pagination on attribute values - #1112 by @orzechdev
 - Paginate attribute values in filters - #1152 by @orzechdev
 - Fix attribute values input display - #1156 by @orzechdev
diff --git a/package-lock.json b/package-lock.json
index 7a464e93b..b2e5771d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "saleor-dashboard",
-  "version": "3.1.0-a.0",
+  "version": "3.0.0-b.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 94073b381..734d86567 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "saleor-dashboard",
-  "version": "3.1.0-a.0",
+  "version": "3.0.0-b.11",
   "main": "src/index.tsx",
   "repository": {
     "type": "git",
diff --git a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
index e9aa9c8a6..ac58393ed 100644
--- a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
+++ b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
@@ -42,7 +42,9 @@ const useStyles = makeStyles(
     },
     root: {
       overflowY: "visible",
-      width: theme.breakpoints.values.sm
+      width: theme.breakpoints.values.sm,
+      margin: 0,
+      padding: theme.spacing(3)
     },
     shippingMethodName: {
       flex: 1,
@@ -139,6 +141,7 @@ const OrderShippingMethodEditDialog: React.FC<OrderShippingMethodEditDialogProps
                 color="primary"
                 variant="contained"
                 type="submit"
+                disabled={!data.shippingMethod}
               >
                 <FormattedMessage {...buttonMessages.confirm} />
               </ConfirmButton>