diff --git a/src/components/TeamAssignment/VolunteersWithTeamWishes.tsx b/src/components/TeamAssignment/VolunteersWithTeamWishes.tsx index 37b2f23..3c201a5 100644 --- a/src/components/TeamAssignment/VolunteersWithTeamWishes.tsx +++ b/src/components/TeamAssignment/VolunteersWithTeamWishes.tsx @@ -3,6 +3,7 @@ import { useSelector } from "react-redux" import { createSelector } from "@reduxjs/toolkit" import { selectVolunteerListAlphaSorted } from "../../store/volunteerList" import { selectTeamList } from "../../store/teamList" +import styles from "./styles.module.scss" const selectVolunteersWithTeamWishes = createSelector( selectVolunteerListAlphaSorted, @@ -12,10 +13,13 @@ const selectVolunteersWithTeamWishes = createSelector( .filter((volunteer) => volunteer.teamWishes.length > 0) .map((volunteer) => ({ ...volunteer, - teamWishes: volunteer.teamWishes.map((wishId) => { - const matchingTeam = teams.find((team: any) => wishId === team?.id) - return matchingTeam?.name - }), + teamWishes: volunteer.teamWishes + .filter((wishId) => wishId !== volunteer.team) + .map((wishId) => { + const matchingTeam = teams.find((team: any) => wishId === team?.id) + return matchingTeam?.name + }), + teamObject: teams.find((team: any) => volunteer.team === team?.id), })) ) @@ -26,12 +30,13 @@ const VolunteersWithTeamWishes: FC = (): JSX.Element => {