From 04320c0ee539b6b6619eebb20c468a0c4e5889a4 Mon Sep 17 00:00:00 2001
From: Taehee Choi <cth5545cth5545@gmail.com>
Date: Fri, 25 Mar 2022 11:08:49 -0700
Subject: [PATCH] linter fixes

---
 src/api/axios.tsx                                       | 2 +-
 src/components/contacts/contacts-components/Sidebar.tsx | 4 ++--
 src/components/home/CallFavouritesDialog.tsx            | 1 +
 src/components/home/Home.tsx                            | 4 ++--
 src/components/login/Login.tsx                          | 4 +++-
 src/redux/middleware/socketMiddleware.tsx               | 5 ++++-
 src/redux/slices/meetingsAndUserStatusSlice.tsx         | 4 ++--
 src/utils.tsx                                           | 3 ++-
 8 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/api/axios.tsx b/src/api/axios.tsx
index 0c91aaf..eda4bef 100644
--- a/src/api/axios.tsx
+++ b/src/api/axios.tsx
@@ -1,5 +1,5 @@
 import axios from "axios";
 
 export default axios.create({
-    baseURL: "https://g17vmhsvwi.execute-api.us-west-2.amazonaws.com/Prod"
+  baseURL: "https://g17vmhsvwi.execute-api.us-west-2.amazonaws.com/Prod"
 });
\ No newline at end of file
diff --git a/src/components/contacts/contacts-components/Sidebar.tsx b/src/components/contacts/contacts-components/Sidebar.tsx
index 47cf766..bf63195 100644
--- a/src/components/contacts/contacts-components/Sidebar.tsx
+++ b/src/components/contacts/contacts-components/Sidebar.tsx
@@ -27,13 +27,13 @@ const Sidebar: React.FC = () => {
   const favorites = useAppSelector((state) =>
     selectUsers(state, favoritesUuids)
   );
-  let filteredFavorites = favorites.filter((favorite) =>
+  const filteredFavorites = favorites.filter((favorite) =>
     favorite.name.toLowerCase().includes(inputText.toLowerCase())
   );
 
   const teamUuids = useAppSelector(selectTeam);
   const team = useAppSelector((state) => selectUsers(state, teamUuids));
-  let filteredTeam = team.filter((member) =>
+  const filteredTeam = team.filter((member) =>
     member.name.toLowerCase().includes(inputText.toLowerCase())
   );
 
diff --git a/src/components/home/CallFavouritesDialog.tsx b/src/components/home/CallFavouritesDialog.tsx
index 63ee88a..58d12c1 100644
--- a/src/components/home/CallFavouritesDialog.tsx
+++ b/src/components/home/CallFavouritesDialog.tsx
@@ -33,6 +33,7 @@ const CallFavouritesDialog: React.FC<Props> = ({
   const handleClose = () => {
     onClose(selectedValue);
   };
+  console.log(users);
 
   const [group, setGroup] = useState<string>("Favorites");
   const [inputText, setInputText] = useState<string>("");
diff --git a/src/components/home/Home.tsx b/src/components/home/Home.tsx
index 879d2a4..7fa09d6 100644
--- a/src/components/home/Home.tsx
+++ b/src/components/home/Home.tsx
@@ -25,9 +25,9 @@ const Home: React.FC = () => {
   return (
     <Container className="main-home">
       <Grid container>
-        {/* <Grid item sm={8}>
+        <Grid item sm={8}>
           <MeetingsPanel />
-        </Grid> */}
+        </Grid>
         <Grid item sm={4}>
           <ShortCuts users={mockUsers} />
         </Grid>
diff --git a/src/components/login/Login.tsx b/src/components/login/Login.tsx
index a61b4f8..71eae7e 100644
--- a/src/components/login/Login.tsx
+++ b/src/components/login/Login.tsx
@@ -78,7 +78,9 @@ const Login: React.FC = () => {
         store.dispatch(fetchFavorites(logedInUserId));
         navigate(from, { replace: true });
       }
-    } catch (error) {}
+    } catch (error) {
+      console.log(error);
+    }
     setEmail(email);
     setPassword("");
   };
diff --git a/src/redux/middleware/socketMiddleware.tsx b/src/redux/middleware/socketMiddleware.tsx
index becdf30..4f47d2f 100644
--- a/src/redux/middleware/socketMiddleware.tsx
+++ b/src/redux/middleware/socketMiddleware.tsx
@@ -10,7 +10,10 @@ const socketMiddleware: Middleware = (store) => {
     const isConnectionEstablished =
       socket && store.getState().meetingsAndUserStatuses.isConnected;
 
-    if (socketActions.startConnecting.match(action)) {
+    if (
+      socketActions.startConnecting.match(action) &&
+      !isConnectionEstablished
+    ) {
       console.log("startConnecting called");
       socket = io("wss://uo5wdcbn6l.execute-api.us-west-2.amazonaws.com/Prod/");
 
diff --git a/src/redux/slices/meetingsAndUserStatusSlice.tsx b/src/redux/slices/meetingsAndUserStatusSlice.tsx
index b449d48..f43fe31 100644
--- a/src/redux/slices/meetingsAndUserStatusSlice.tsx
+++ b/src/redux/slices/meetingsAndUserStatusSlice.tsx
@@ -70,8 +70,8 @@ export const selectMeetings = (state: RootState) =>
 export const selectMeeting = (state: RootState, meetingID: string | null) => {
   return meetingID !== null
     ? state.meetingsAndUserStatuses.meetings.find(
-        (meeting) => meeting.meetingId === meetingID
-      )
+      (meeting) => meeting.meetingId === meetingID
+    )
     : null;
 };
 export const selectUserUpcomingMeetings = (state: RootState, uuid: string) => {
diff --git a/src/utils.tsx b/src/utils.tsx
index 6dbb3d5..3e2ad36 100644
--- a/src/utils.tsx
+++ b/src/utils.tsx
@@ -17,7 +17,8 @@ const getStatusColor = (ms: MeetingStatus): string => {
 const formatTimeFromDate = (date: Date): string => {
   let hour = date.getHours();
   let ampm = "";
-  let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes();
+  const minutes =
+    date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes();
   if (hour < 12) {
     ampm = "am";
   } else {