Bring back the rageshake request modal
This commit is contained in:
parent
dc8d0fd81b
commit
9c2f4be17c
2 changed files with 15 additions and 2 deletions
|
@ -75,6 +75,8 @@ import { NewVideoGrid } from "../video-grid/NewVideoGrid";
|
||||||
import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
|
import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
|
||||||
import { SettingsModal } from "../settings/SettingsModal";
|
import { SettingsModal } from "../settings/SettingsModal";
|
||||||
import { InviteModal } from "./InviteModal";
|
import { InviteModal } from "./InviteModal";
|
||||||
|
import { useRageshakeRequestModal } from "../settings/submit-rageshake";
|
||||||
|
import { RageshakeRequestModal } from "./RageshakeRequestModal";
|
||||||
|
|
||||||
const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
|
const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
|
||||||
// There is currently a bug in Safari our our code with cloning and sending MediaStreams
|
// There is currently a bug in Safari our our code with cloning and sending MediaStreams
|
||||||
|
@ -340,6 +342,11 @@ export function InCallView({
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const {
|
||||||
|
modalState: rageshakeRequestModalState,
|
||||||
|
modalProps: rageshakeRequestModalProps,
|
||||||
|
} = useRageshakeRequestModal(groupCall.room.roomId);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
modalState: settingsModalState,
|
modalState: settingsModalState,
|
||||||
modalProps: settingsModalProps,
|
modalProps: settingsModalProps,
|
||||||
|
@ -469,10 +476,16 @@ export function InCallView({
|
||||||
otelGroupCallMembership={otelGroupCallMembership}
|
otelGroupCallMembership={otelGroupCallMembership}
|
||||||
show={showInspector}
|
show={showInspector}
|
||||||
/>
|
/>
|
||||||
|
{rageshakeRequestModalState.isOpen && !noControls && (
|
||||||
|
<RageshakeRequestModal
|
||||||
|
{...rageshakeRequestModalProps}
|
||||||
|
roomIdOrAlias={roomIdOrAlias}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{settingsModalState.isOpen && (
|
{settingsModalState.isOpen && (
|
||||||
<SettingsModal
|
<SettingsModal
|
||||||
client={client}
|
client={client}
|
||||||
roomId={roomIdOrAlias}
|
roomId={groupCall.room.roomId}
|
||||||
{...settingsModalProps}
|
{...settingsModalProps}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -309,7 +309,7 @@ export const PTTCallView: React.FC<Props> = ({
|
||||||
{settingsModalState.isOpen && (
|
{settingsModalState.isOpen && (
|
||||||
<SettingsModal
|
<SettingsModal
|
||||||
client={client}
|
client={client}
|
||||||
roomId={roomIdOrAlias}
|
roomId={groupCall.room.roomId}
|
||||||
{...settingsModalProps}
|
{...settingsModalProps}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
Loading…
Add table
Reference in a new issue