diff --git a/src/room/PTTCallView.tsx b/src/room/PTTCallView.tsx index 4acd7a6..765e8f8 100644 --- a/src/room/PTTCallView.tsx +++ b/src/room/PTTCallView.tsx @@ -37,6 +37,8 @@ import { getAvatarUrl } from "../matrix-utils"; import { ReactComponent as AudioIcon } from "../icons/Audio.svg"; import { usePTTSounds } from "../sound/usePttSounds"; import { PTTClips } from "../sound/PTTClips"; +import { GroupCallInspector } from "./GroupCallInspector"; +import { FeedbackModal } from "./FeedbackModal"; function getPromptText( showTalkOverError: boolean, @@ -102,6 +104,8 @@ export const PTTCallView: React.FC = ({ useModalTriggerState(); const { modalState: settingsModalState, modalProps: settingsModalProps } = useModalTriggerState(); + const { modalState: feedbackModalState, modalProps: feedbackModalProps } = + useModalTriggerState(); const [containerRef, bounds] = useMeasure({ polyfill: ResizeObserver }); const facepileSize = bounds.width < 800 ? "sm" : "md"; const pttButtonSize = 232; @@ -148,6 +152,13 @@ export const PTTCallView: React.FC = ({ startTalkingRemoteRef={startTalkingRemoteRef} blockedRef={blockedRef} /> +
@@ -232,6 +243,14 @@ export const PTTCallView: React.FC = ({ {...settingsModalProps} setShowInspector={setShowInspector} showInspector={showInspector} + showFeedbackDialog={feedbackModalState.open} + /> + )} + {feedbackModalState.isOpen && ( + )} {inviteModalState.isOpen && ( diff --git a/src/settings/SettingsModal.jsx b/src/settings/SettingsModal.jsx index 3868864..a5a1de6 100644 --- a/src/settings/SettingsModal.jsx +++ b/src/settings/SettingsModal.jsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from "react"; +import React, { useCallback } from "react"; import { Modal } from "../Modal"; import styles from "./SettingsModal.module.css"; import { TabContainer, TabItem } from "../tabs/Tabs"; @@ -29,7 +29,12 @@ import { Button } from "../button"; import { useDownloadDebugLog } from "./submit-rageshake"; import { Body } from "../typography/Typography"; -export function SettingsModal({ setShowInspector, showInspector, ...rest }) { +export function SettingsModal({ + setShowInspector, + showInspector, + showFeedbackDialog, + ...rest +}) { const { audioInput, audioInputs, @@ -125,6 +130,7 @@ export function SettingsModal({ setShowInspector, showInspector, ...rest }) { + diff --git a/vite.config.js b/vite.config.js index 95f6c3d..bb2f299 100644 --- a/vite.config.js +++ b/vite.config.js @@ -39,6 +39,11 @@ export default defineConfig(({ mode }) => { proxy: { "/_matrix": env.VITE_DEFAULT_HOMESERVER || "http://localhost:8008", }, + strictPort: true, + hmr: { + port: 443, + protocol: 'wss', + }, }, resolve: { dedupe: [