more fixes

element-hq · Jul 4, 2022 · 81526cb · 81526cb
1 parent 41e7418
commit 81526cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/ClientContext.tsx b/src/ClientContext.tsx
@@ -125,6 +125,7 @@ export const ClientProvider: FC = ({ children }) => {
           isAuthenticated: Boolean(client),
           isPasswordlessUser,
           userName: client?.getUserIdLocalpart(),
+          error: undefined,
         });
       })
       .catch(() => {
@@ -134,6 +135,7 @@ export const ClientProvider: FC = ({ children }) => {
           isAuthenticated: false,
           isPasswordlessUser: false,
           userName: null,
+          error: undefined,
         });
       });
   }, []);
@@ -163,6 +165,7 @@ export const ClientProvider: FC = ({ children }) => {
         isAuthenticated: true,
         isPasswordlessUser: false,
         userName: client.getUserIdLocalpart(),
+        error: undefined,
       });
     },
     [client]
@@ -183,6 +186,7 @@ export const ClientProvider: FC = ({ children }) => {
           isAuthenticated: true,
           isPasswordlessUser: session.passwordlessUser,
           userName: newClient.getUserIdLocalpart(),
+          error: undefined,
         });
       } else {
         clearSession();
@@ -193,6 +197,7 @@ export const ClientProvider: FC = ({ children }) => {
           isAuthenticated: false,
           isPasswordlessUser: false,
           userName: null,
+          error: undefined,
         });
       }
     },
@@ -251,6 +256,7 @@ export const ClientProvider: FC = ({ children }) => {
       logout,
       userName,
       setClient,
+      error: undefined,
     }),
     [
       loading,

diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
@@ -68,6 +68,7 @@ interface Props {
   onLeave: () => void;
   isScreensharing: boolean;
   screenshareFeeds: CallFeed[];
+  localScreenshareFeed: CallFeed;
   roomId: string;
   unencryptedEventsFromUsers: Set<string>;
 }
@@ -94,6 +95,7 @@ export function InCallView({
   toggleScreensharing,
   isScreensharing,
   screenshareFeeds,
+  localScreenshareFeed,
   roomId,
   unencryptedEventsFromUsers,
 }: Props) {

diff --git a/src/room/LobbyView.tsx b/src/room/LobbyView.tsx
@@ -44,7 +44,7 @@ interface Props {
   microphoneMuted: boolean;
   toggleLocalVideoMuted: () => void;
   toggleMicrophoneMuted: () => void;
-  localVideoMuted: () => void;
+  localVideoMuted: boolean;
   roomId: string;
 }
 export function LobbyView({