From af69b9741e56141b6e17787a1b5373291016bd05 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 4 Apr 2019 21:46:29 +0300 Subject: Fix external avatars --- vnext/src/components/Avatar.js | 14 ++++---------- vnext/src/components/UserInfo.js | 8 ++++---- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/vnext/src/components/Avatar.js b/vnext/src/components/Avatar.js index dc2050ce..d4e83b7b 100644 --- a/vnext/src/components/Avatar.js +++ b/vnext/src/components/Avatar.js @@ -17,16 +17,10 @@ function Avatar(props) { useEffect(() => { setUser(props.user); isMounted = true; - if (!user.uid && user.uri) { - fetchUserUri(user.uri).then(response => { - if (isMounted) { - setUser(response.data); - } - }); - return () => { - isMounted = false; - }; - } + + return () => { + isMounted = false; + }; }, [props.user, user.uid, user.uri]); return (
diff --git a/vnext/src/components/UserInfo.js b/vnext/src/components/UserInfo.js index 19b2f82b..835bbace 100644 --- a/vnext/src/components/UserInfo.js +++ b/vnext/src/components/UserInfo.js @@ -77,15 +77,15 @@ export function UserLink(props) { setUser(response.data); } }); - return () => { - isMounted = false; - }; } + return () => { + isMounted = false; + }; }, [props.user, user.uid, user.uri]); return ( user.uid ? {user.uname} - : {user.uname} + : {user.uname} ); } -- cgit v1.2.3