From cc9132f8c3dccf47b8111a11cd9ce2021168da40 Mon Sep 17 00:00:00 2001
From: Victor Morfin <v-vmorfin@expediagroup.com>
Date: Wed, 7 Apr 2021 13:16:36 -0600
Subject: [PATCH 1/4] Adding close button to Support menu

Signed-off-by: Victor Morfin <v-vmorfin@expediagroup.com>
---
 .../core/src/components/SupportButton/SupportButton.tsx     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/core/src/components/SupportButton/SupportButton.tsx b/packages/core/src/components/SupportButton/SupportButton.tsx
index eea2b000ca..5bbde953b0 100644
--- a/packages/core/src/components/SupportButton/SupportButton.tsx
+++ b/packages/core/src/components/SupportButton/SupportButton.tsx
@@ -16,6 +16,7 @@
 
 import { HelpIcon, useApp } from '@backstage/core-api';
 import {
+  Box,
   Button,
   List,
   ListItem,
@@ -127,6 +128,11 @@ export const SupportButton = ({ children }: PropsWithChildren<Props>) => {
           {items &&
             items.map((item, i) => <SupportListItem item={item} key={i} />)}
         </List>
+        <Box display="flex" justifyContent="flex-end">
+          <Button color="primary" onClick={popoverCloseHandler}>
+            Close
+          </Button>
+        </Box>
       </Popover>
     </Fragment>
   );

From 9a9e7a42f440742121207d3dd7107df3367396f5 Mon Sep 17 00:00:00 2001
From: Victor Morfin <v-vmorfin@expediagroup.com>
Date: Wed, 7 Apr 2021 14:30:22 -0600
Subject: [PATCH 2/4] Adding changeset

Signed-off-by: Victor Morfin <v-vmorfin@expediagroup.com>
---
 .changeset/stale-chefs-retire.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/stale-chefs-retire.md

diff --git a/.changeset/stale-chefs-retire.md b/.changeset/stale-chefs-retire.md
new file mode 100644
index 0000000000..579f5c3042
--- /dev/null
+++ b/.changeset/stale-chefs-retire.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core': minor
+---
+
+Adding close button on support menu

From aec9ca24b11bb2a6cb01aa0bcea8e2d0ce24230b Mon Sep 17 00:00:00 2001
From: Victor Morfin <v-vmorfin@expediagroup.com>
Date: Thu, 8 Apr 2021 10:31:24 -0600
Subject: [PATCH 3/4] Changing changeset minor to patch

Signed-off-by: Victor Morfin <v-vmorfin@expediagroup.com>
---
 .changeset/stale-chefs-retire.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/stale-chefs-retire.md b/.changeset/stale-chefs-retire.md
index 579f5c3042..e43c20062a 100644
--- a/.changeset/stale-chefs-retire.md
+++ b/.changeset/stale-chefs-retire.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/core': minor
+'@backstage/core': patch
 ---
 
 Adding close button on support menu

From 72de2a1428535d7a74ed7ef9e38eb4d966515eb7 Mon Sep 17 00:00:00 2001
From: Victor Morfin <v-vmorfin@expediagroup.com>
Date: Thu, 8 Apr 2021 11:28:24 -0600
Subject: [PATCH 4/4] Changing box component to DialogActions component

Signed-off-by: Victor Morfin <v-vmorfin@expediagroup.com>
---
 .../core/src/components/SupportButton/SupportButton.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/components/SupportButton/SupportButton.tsx b/packages/core/src/components/SupportButton/SupportButton.tsx
index 5bbde953b0..d0c2412dad 100644
--- a/packages/core/src/components/SupportButton/SupportButton.tsx
+++ b/packages/core/src/components/SupportButton/SupportButton.tsx
@@ -16,8 +16,8 @@
 
 import { HelpIcon, useApp } from '@backstage/core-api';
 import {
-  Box,
   Button,
+  DialogActions,
   List,
   ListItem,
   ListItemIcon,
@@ -128,11 +128,11 @@ export const SupportButton = ({ children }: PropsWithChildren<Props>) => {
           {items &&
             items.map((item, i) => <SupportListItem item={item} key={i} />)}
         </List>
-        <Box display="flex" justifyContent="flex-end">
+        <DialogActions>
           <Button color="primary" onClick={popoverCloseHandler}>
             Close
           </Button>
-        </Box>
+        </DialogActions>
       </Popover>
     </Fragment>
   );