From 00ffa1b6cd2cc0eea33a24980ba05dea52e35731 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 May 2022 22:43:22 +0100
Subject: [PATCH] Add types from merge & fix import order
---
src/{types.d.ts => @types/modules.d.ts} | 0
src/room/PTTCallView.tsx | 2 +-
src/room/usePTT.ts | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
rename src/{types.d.ts => @types/modules.d.ts} (100%)
diff --git a/src/types.d.ts b/src/@types/modules.d.ts
similarity index 100%
rename from src/types.d.ts
rename to src/@types/modules.d.ts
diff --git a/src/room/PTTCallView.tsx b/src/room/PTTCallView.tsx
index 54ea6a7..d929713 100644
--- a/src/room/PTTCallView.tsx
+++ b/src/room/PTTCallView.tsx
@@ -17,6 +17,7 @@ limitations under the License.
import React from "react";
import useMeasure from "react-use-measure";
import { ResizeObserver } from "@juggle/resize-observer";
+import { OtherUserSpeakingError } from "matrix-js-sdk/src/webrtc/groupCall";
import { useModalTriggerState } from "../Modal";
import { SettingsModal } from "../settings/SettingsModal";
@@ -33,7 +34,6 @@ import { Timer } from "./Timer";
import { Toggle } from "../input/Toggle";
import { getAvatarUrl } from "../matrix-utils";
import { ReactComponent as AudioIcon } from "../icons/Audio.svg";
-import { OtherUserSpeakingError } from "matrix-js-sdk/src/webrtc/groupCall";
export function PTTCallView({
client,
diff --git a/src/room/usePTT.ts b/src/room/usePTT.ts
index 1c13d34..d33a38b 100644
--- a/src/room/usePTT.ts
+++ b/src/room/usePTT.ts
@@ -27,6 +27,7 @@ export interface PTTState {
activeSpeakerUserId: string;
startTalking: () => void;
stopTalking: () => void;
+ unmuteError: Error;
}
export const usePTT = (