diff --git a/app/routes/settings.tsx b/app/routes/settings.tsx index 1114a0c3e..7319c7b72 100644 --- a/app/routes/settings.tsx +++ b/app/routes/settings.tsx @@ -5,8 +5,8 @@ import Export from "~/scenes/Settings/Export"; import Features from "~/scenes/Settings/Features"; import Groups from "~/scenes/Settings/Groups"; import Import from "~/scenes/Settings/Import"; +import Members from "~/scenes/Settings/Members"; import Notifications from "~/scenes/Settings/Notifications"; -import People from "~/scenes/Settings/People"; import Profile from "~/scenes/Settings/Profile"; import Security from "~/scenes/Settings/Security"; import Shares from "~/scenes/Settings/Shares"; @@ -24,7 +24,7 @@ export default function SettingsRoutes() { - + diff --git a/app/scenes/Settings/People.tsx b/app/scenes/Settings/Members.tsx similarity index 96% rename from app/scenes/Settings/People.tsx rename to app/scenes/Settings/Members.tsx index 0c365a3ce..7abaf2fd7 100644 --- a/app/scenes/Settings/People.tsx +++ b/app/scenes/Settings/Members.tsx @@ -5,6 +5,7 @@ import * as React from "react"; import { Trans, useTranslation } from "react-i18next"; import { useHistory, useLocation } from "react-router-dom"; import scrollIntoView from "smooth-scroll-into-view-if-needed"; +import styled from "styled-components"; import { PAGINATION_SYMBOL } from "~/stores/BaseStore"; import User from "~/models/User"; import Invite from "~/scenes/Invite"; @@ -23,7 +24,7 @@ import useStores from "~/hooks/useStores"; import PeopleTable from "./components/PeopleTable"; import UserStatusFilter from "./components/UserStatusFilter"; -function People() { +function Members() { const topRef = React.useRef(); const location = useLocation(); const history = useHistory(); @@ -223,7 +224,7 @@ function People() { placeholder={`${t("Filter")}…`} onChange={handleSearch} /> - + void; }; -const UserStatusFilter = ({ activeKey, onSelect }: Props) => { +const UserStatusFilter = ({ activeKey, onSelect, ...rest }: Props) => { const { t } = useTranslation(); const options = React.useMemo( () => [ @@ -45,6 +45,7 @@ const UserStatusFilter = ({ activeKey, onSelect }: Props) => { activeKey={activeKey} onSelect={onSelect} defaultLabel={t("Active")} + {...rest} /> ); };