fix optional chaining

chanzuckerberg · Oct 7, 2020 · 35e5786 · 35e5786
1 parent c30b8a9
commit 35e5786
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/client/src/components/leftSidebar/topLeftLogoAndTitle.js b/client/src/components/leftSidebar/topLeftLogoAndTitle.js
@@ -107,9 +107,9 @@ class LeftSideBar extends React.Component {
               userinfo,
             }}
           />
-          {!userinfo.is_authenticated ? (
+          {!userinfo.is_authenticated && (
             <AuthButtons auth={auth} userinfo={userinfo} />
-          ) : null}
+          )}
         </div>
       </div>
     );

diff --git a/client/src/components/menubar/authButtons.js b/client/src/components/menubar/authButtons.js
@@ -1,4 +1,3 @@
-/* eslint-disable camelcase -- Allowing snake_case from BE */
 import React, { useState } from "react";
 import {
   AnchorButton,
@@ -24,6 +23,8 @@ const Auth = React.memo((props) => {
 
   const { auth, userinfo } = props;
 
+  const isAuthenticated = userinfo && userinfo.is_authenticated;
+
   if (shouldShowAuth()) return null;
 
   const AuthButton = () => {
@@ -32,9 +33,9 @@ const Auth = React.memo((props) => {
         type="button"
         data-testid="auth-button"
         disabled={false}
-        href={!userinfo?.is_authenticated ? auth.login : auth.logout}
+        href={isAuthenticated ? auth.logout : auth.login}
       >
-        {!userinfo?.is_authenticated ? "Log In" : "Log Out"}
+        {isAuthenticated ? "Log Out" : "Log In"}
       </AnchorButton>
     );
   };
@@ -62,13 +63,13 @@ const Auth = React.memo((props) => {
   );
 
   function shouldShowAuth() {
-    return auth?.requires_client_login;
+    return auth && auth.requires_client_login;
   }
 
   function shouldShowPrompt() {
     if (storageGet(KEYS.LOGIN_PROMPT) === LOGIN_PROMPT_OFF) return false;
 
-    return shouldShowAuth && !userinfo?.is_authenticated;
+    return shouldShowAuth && !isAuthenticated;
   }
 });
 
@@ -119,4 +120,3 @@ function PopoverContent({ setIsPromptOpen }) {
 }
 
 export default Auth;
-/* eslint-enable camelcase -- BE */