Merge branch 'livekit' into app-selection

2023-09-18 11:50:09 -04:00
parent 662a85c16a 43d12e815a
commit b53868cbc9
34 changed files with 1418 additions and 1924 deletions
--- a/src/room/AppSelectionModal.tsx
+++ b/src/room/AppSelectionModal.tsx
@@ -19,7 +19,7 @@ import { useTranslation } from "react-i18next";
 import { Button, Text } from "@vector-im/compound-web";
 import { ReactComponent as PopOutIcon } from "@vector-im/compound-design-tokens/icons/pop-out.svg";

-import { Modal } from "../NewModal";
+import { Modal } from "../Modal";
 import { useRoomSharedKey } from "../e2ee/sharedKeyManagement";
 import { getRoomUrl } from "../matrix-utils";
 import styles from "./AppSelectionModal.module.css";