From e984e6fc14b0c61018f57876a81917e9d1ee1cc7 Mon Sep 17 00:00:00 2001 From: noahtalerman <47070608+noahtalerman@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:49:17 -0400 Subject: [PATCH] Render correct "Edit user" modal on the Team details - members page (#1136) - Determine the current user's correct tier and render the correct "Edit user" modal --- .../TeamDetailsWrapper/MembersPagePage/MembersPage.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/MembersPagePage/MembersPage.tsx b/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/MembersPagePage/MembersPage.tsx index b8755785d4..b53cc93ce2 100644 --- a/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/MembersPagePage/MembersPage.tsx +++ b/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/MembersPagePage/MembersPage.tsx @@ -3,6 +3,7 @@ import { useDispatch, useSelector } from "react-redux"; // @ts-ignore import memoize from "memoize-one"; +import { IConfig } from "interfaces/config"; import { IUser } from "interfaces/user"; import { INewMembersBody, ITeam } from "interfaces/team"; import { Link } from "react-router"; @@ -32,10 +33,12 @@ interface IMembersPageProps { params: { team_id: string; }; - isBasicTier: boolean; } interface IRootState { + app: { + config: IConfig; + }; entities: { users: { loading: boolean; @@ -69,11 +72,13 @@ let tableQueryData = {}; const MembersPage = (props: IMembersPageProps): JSX.Element => { const { params: { team_id }, - isBasicTier, } = props; const teamId = parseInt(team_id, 10); const dispatch = useDispatch(); + const isBasicTier = useSelector((state: IRootState) => { + return state.app.config.tier === "basic"; + }); const loadingTableData = useSelector( (state: IRootState) => state.entities.users.loading );