Merge branch 'main' into sync-webapp

100mslive · Dec 8, 2023 · 0138271 · 0138271
2 parents 1c14004 + 9f97658
commit 0138271
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/.eslintrc b/.eslintrc
@@ -35,6 +35,7 @@
       }
     ],
     "import/first": "error",
+    "no-nested-ternary": 1,
     "import/no-duplicates": "error",
     "simple-import-sort/imports": [
       "error",

diff --git a/src/components/conference.jsx b/src/components/conference.jsx
@@ -10,7 +10,7 @@ import {
   useHMSStore,
 } from "@100mslive/react-sdk";
 import { Box, Flex } from "@100mslive/roomkit-react";
-import { ConferenceMainView } from "../layouts/mainView";
+import { ConferenceMainView } from "../layouts/ConferenceMainView";
 import { Footer } from "./Footer";
 import FullPageProgress from "./FullPageProgress";
 import { Header } from "./Header";

diff --git a/src/layouts/mainView.jsx → src/layouts/ConferenceMainView.jsx b/src/layouts/mainView.jsx → src/layouts/ConferenceMainView.jsx