Merge branch 'main' into robertlong/spotlight-layout

2022-02-02 15:15:39 -08:00
parent 19fe760833 c4f335ebb6
commit dec47d21c0
53 changed files with 3531 additions and 2987 deletions
--- a/src/room/InCallView.jsx
+++ b/src/room/InCallView.jsx
@@ -128,7 +128,7 @@ export function InCallView({
        </LeftNav>
        <RightNav>
          <GridLayoutMenu layout={layout} setLayout={setLayout} />
-          <UserMenuContainer disableLogout />
+          <UserMenuContainer preventNavigation />
        </RightNav>
      </Header>
      {items.length === 0 ? (