fix merge

Author: saylestyler

app/components/Login.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import styled, { keyframes } from 'styled-components';
 import { useState, useEffect } from 'react';
-import styled from 'styled-components';
 import { Redirect } from 'react-router-dom';
 import { ipcRenderer } from 'electron';
 
@@ -244,7 +243,6 @@ const Login = () => {
     }
   };
 
-
   // IPC messaging listeners
   useEffect(() => {
     ipcRenderer.on('db-connection-error', (_event, err) => {
@@ -259,12 +257,14 @@ const Login = () => {
       setRedirectToHome(true);
     });
     ipcRenderer.send('login-mounted');
-    ipcRenderer.on('logout-reason', (_event, message) => setLoggedOutMessage(message));
+    ipcRenderer.on('logout-reason', (_event, message) =>
+      setLoggedOutMessage(message)
+    );
     return () => {
       ipcRenderer.removeAllListeners('db-connection-error');
       ipcRenderer.removeAllListeners('tabledata-to-login');
       ipcRenderer.removeAllListeners('logout-reason');
-    }
+    };
   }, []);
 
   const captureURI = (e): void => {
@@ -291,10 +291,14 @@ const Login = () => {
         </LeftPanel>
         <RightPanel>
           <LoginContainer>
-            {loggedOutMessage === 'inactivity' &&
-              <LogoutMessage>You've been logged out due to inactivity</LogoutMessage>}
-            {loggedOutMessage === 'userlogout' &&
-              <LogoutMessage>You logged out</LogoutMessage>}
+            {loggedOutMessage === 'inactivity' && (
+              <LogoutMessage>
+                You've been logged out due to inactivity
+              </LogoutMessage>
+            )}
+            {loggedOutMessage === 'userlogout' && (
+              <LogoutMessage>You logged out</LogoutMessage>
+            )}
             {connectionError && (
               <ConnectionErrorMessage>
                 Unable to connect to the database. Please try again.

app/components/sidepanels/SettingsPanel.tsx

@@ -44,23 +44,20 @@ const SignOut = styled.span`
   color: ${props => props.theme.link.signOut};
 `;
 
-
 const SettingsPanel = ({ intervalId }) => {
   const [context, setContext] = useContext(Context);
   const [state, dispatch] = useReducer(themeReducer, context);
   const [activeMode, setActiveMode] = useState('default');
-  const [toggle, setToggle] = useState(false);
-  const contextText = context.light.toString();
-  
+
   const logOut = () => {
     clearInterval(intervalId);
     ipcRenderer.send('logout-to-main', 'userlogout');
-  }
+  };
 
   useEffect(() => {
     setContext(state);
   }, [state]);
- 
+
   return (
     <PanelWrapper>
       <TopSection>
@@ -96,16 +93,13 @@ const SettingsPanel = ({ intervalId }) => {
           </select>
         </DivWrapper>
       </TopSection>
-      <BottomSection>  
+      <BottomSection>
         <NavLink onClick={logOut} to="/">
-          <SignOut>
-            SignOut
-          </SignOut>
+          <SignOut>SignOut</SignOut>
         </NavLink>
       </BottomSection>
     </PanelWrapper>
   );
 };
 
 export default SettingsPanel;
-