From 77a90a473c5eb016b0ccb0c33f7151b27b6667ef Mon Sep 17 00:00:00 2001
From: Chen-I Lim <46905241+chenilim@users.noreply.github.com>
Date: Sat, 17 Jul 2021 09:01:45 -0700
Subject: [PATCH] Fix #739: Don't show account options as plugin (#745)

---
 webapp/src/components/sidebar/sidebar.tsx         | 4 +++-
 webapp/src/components/sidebar/sidebarUserMenu.tsx | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/webapp/src/components/sidebar/sidebar.tsx b/webapp/src/components/sidebar/sidebar.tsx
index 9609b9419..c25f06321 100644
--- a/webapp/src/components/sidebar/sidebar.tsx
+++ b/webapp/src/components/sidebar/sidebar.tsx
@@ -63,13 +63,15 @@ const Sidebar = React.memo((props: Props) => {
         )
     }
 
+    const hasWorkspace = Boolean(workspace && workspace.id !== '0')
     return (
         <div className='Sidebar octo-sidebar'>
             <div className='octo-sidebar-header'>
                 <div className='heading'>
                     <SidebarUserMenu
                         whiteLogo={whiteLogo}
-                        showVersionBadge={Boolean(workspace && workspace.id !== '0')}
+                        showVersionBadge={hasWorkspace}
+                        showAccountActions={!hasWorkspace}
                     />
                 </div>
 
diff --git a/webapp/src/components/sidebar/sidebarUserMenu.tsx b/webapp/src/components/sidebar/sidebarUserMenu.tsx
index da5da2306..acb647254 100644
--- a/webapp/src/components/sidebar/sidebarUserMenu.tsx
+++ b/webapp/src/components/sidebar/sidebarUserMenu.tsx
@@ -23,12 +23,13 @@ import './sidebarUserMenu.scss'
 type Props = {
     whiteLogo: boolean
     showVersionBadge: boolean
+    showAccountActions: boolean
 }
 
 const SidebarUserMenu = React.memo((props: Props) => {
     const history = useHistory()
     const [showRegistrationLinkDialog, setShowRegistrationLinkDialog] = useState(false)
-    const {whiteLogo, showVersionBadge} = props
+    const {whiteLogo, showVersionBadge, showAccountActions} = props
     const user = useAppSelector<IUser|null>(getCurrentUser)
     const intl = useIntl()
     return (
@@ -48,7 +49,7 @@ const SidebarUserMenu = React.memo((props: Props) => {
                         </div>
                     </div>
                     <Menu>
-                        {user && user.username !== 'single-user' && <>
+                        {showAccountActions && user && user.username !== 'single-user' && <>
                             <Menu.Label><b>{user.username}</b></Menu.Label>
                             <Menu.Text
                                 id='logout'