diff --git a/contexts/audioContext.tsx b/contexts/audioContext.tsx
index 78e226b..160ce00 100644
--- a/contexts/audioContext.tsx
+++ b/contexts/audioContext.tsx
@@ -54,7 +54,7 @@ export default function AudioContextProvider({ children }) {
   const [isRecording, setIsRecording] = useState<Boolean>(false);
   const [hasRecPermit, setHasRecPermit] = useState<Boolean>(false);
 
-  const [teamShortcutMappings, setTeamShortcutMappings] = useState<{}>(null);
+  const [teamShortcutMappings, setTeamShortcutMappings] = useState<{}>({});
   const [audioInputDeviceId, setAudioInputDevice] = useState<string>(null); // device id
   const [audioOutputDeviceId, setAudioOutputDevice] = useState<string>(null); // device id
 
diff --git a/contexts/authContext.js b/contexts/authContext.js
index 41fbe15..c883e92 100644
--- a/contexts/authContext.js
+++ b/contexts/authContext.js
@@ -7,6 +7,7 @@ import {
   User,
 } from "firebase/auth";
 import React, { useContext, useEffect, useState } from "react";
+import toast from "react-hot-toast";
 import firebase from "../services/firebaseService";
 
 const AuthContext = React.createContext(null);
@@ -44,6 +45,7 @@ export function AuthProvider({ children }) {
       .then((res) => {
         // This gives you a Google Access Token. You can use it to access the Google API.
         const credential = GoogleAuthProvider.credentialFromResult(res);
+
         const token = credential.accessToken;
         // The signed-in user info.
         const user = res.user;
@@ -61,7 +63,7 @@ export function AuthProvider({ children }) {
         // The AuthCredential type that was used.
         const credential = GoogleAuthProvider.credentialFromError(error);
         console.log(error);
-        throw error;
+        toast.error("something went wrong");
       });
   };
 
diff --git a/services/userService.tsx b/services/userService.tsx
index dd69436..67073d7 100644
--- a/services/userService.tsx
+++ b/services/userService.tsx
@@ -66,9 +66,9 @@ export default class UserService {
     );
   }
 
-  async updateUserStatus(userId: string, newStatus: UserStatus) {
+  updateUserStatus(userId: string, newStatus: UserStatus) {
     const docRef = doc(this.db, Collections.users, userId);
-    await setDoc(
+    setDoc(
       docRef,
       { userStatus: newStatus, lastUpdatedDate: serverTimestamp() },
       { merge: true }