From 9e1c5d1db3883cd74006c6ca731cc9668f6dd320 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Wed, 2 Dec 2020 20:48:24 -0800 Subject: [PATCH] fix: JS error in UserProfile introduced in refactoring to functional component --- app/scenes/UserProfile.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/scenes/UserProfile.js b/app/scenes/UserProfile.js index fbfd6b0c2..05b2e7e78 100644 --- a/app/scenes/UserProfile.js +++ b/app/scenes/UserProfile.js @@ -1,14 +1,12 @@ // @flow import distanceInWordsToNow from "date-fns/distance_in_words_to_now"; -import { inject, observer } from "mobx-react"; +import { observer } from "mobx-react"; import { EditIcon } from "outline-icons"; import * as React from "react"; import { useTranslation } from "react-i18next"; import { withRouter, type RouterHistory } from "react-router-dom"; import styled from "styled-components"; import { settings } from "shared/utils/routeHelpers"; -import AuthStore from "stores/AuthStore"; -import DocumentsStore from "stores/DocumentsStore"; import User from "models/User"; import Avatar from "components/Avatar"; import Badge from "components/Badge"; @@ -18,20 +16,23 @@ import HelpText from "components/HelpText"; import Modal from "components/Modal"; import PaginatedDocumentList from "components/PaginatedDocumentList"; import Subheading from "components/Subheading"; +import useCurrentUser from "hooks/useCurrentUser"; +import useStores from "hooks/useStores"; type Props = { user: User, - auth: AuthStore, - documents: DocumentsStore, history: RouterHistory, onRequestClose: () => void, }; function UserProfile(props: Props) { const { t } = useTranslation(); - const { user, auth, documents, ...rest } = props; + const { documents } = useStores(); + const currentUser = useCurrentUser(); + const { user, ...rest } = props; + if (!user) return null; - const isCurrentUser = auth.user && auth.user.id === user.id; + const isCurrentUser = currentUser.id === user.id; return (