From b2b2aa8f057a15482019ad15c4c887442c6f3aa0 Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Wed, 18 Sep 2024 21:34:10 -0400
Subject: [PATCH] fix extra divider on owner list picker

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .changeset/angry-windows-decide.md                           | 5 +++++
 .../src/components/ListTasksPage/OwnerListPicker.tsx         | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/angry-windows-decide.md

diff --git a/.changeset/angry-windows-decide.md b/.changeset/angry-windows-decide.md
new file mode 100644
index 0000000000..6a5c225e80
--- /dev/null
+++ b/.changeset/angry-windows-decide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix extra divider displayed in owner list picker on list tasks page
diff --git a/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx b/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx
index 00efed45ba..44f3d46974 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx
@@ -113,10 +113,10 @@ export const OwnerListPicker = (props: {
           </Typography>
           <Card className={classes.groupWrapper}>
             <List disablePadding dense role="menu">
-              {group.items.map(item => (
+              {group.items.map((item, index) => (
                 <MenuItem
                   key={item.id}
-                  divider
+                  divider={index !== group.items.length - 1}
                   ContainerProps={{ role: 'menuitem' }}
                   onClick={() => onSelectOwner(item.id as 'owned' | 'all')}
                   selected={item.id === filter}