From 4168540017c881a43e4e723ebadf0978f76f1d16 Mon Sep 17 00:00:00 2001 From: Robert Long Date: Mon, 7 Feb 2022 15:24:43 -0800 Subject: [PATCH] Added group_call_rageshake_request_id for rageshake grouping --- src/room/FeedbackModal.jsx | 11 +++++++++-- src/room/RageshakeRequestModal.jsx | 15 ++++++++++----- src/settings/rageshake.js | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/room/FeedbackModal.jsx b/src/room/FeedbackModal.jsx index bc1c941c..5e492a28 100644 --- a/src/room/FeedbackModal.jsx +++ b/src/room/FeedbackModal.jsx @@ -4,6 +4,7 @@ import { Button } from "../button"; import { FieldRow, InputField, ErrorMessage } from "../input/Input"; import { useSubmitRageshake, useRageshakeRequest } from "../settings/rageshake"; import { Body } from "../typography/Typography"; +import { randomString } from "matrix-js-sdk/src/randomstring"; export function FeedbackModal({ inCall, roomId, ...rest }) { const { submitRageshake, sending, sent, error } = useSubmitRageshake(); @@ -15,10 +16,16 @@ export function FeedbackModal({ inCall, roomId, ...rest }) { const data = new FormData(e.target); const description = data.get("description"); const sendLogs = data.get("sendLogs"); - submitRageshake({ description, sendLogs }); + const rageshakeRequestId = randomString(16); + + submitRageshake({ + description, + sendLogs, + rageshakeRequestId, + }); if (inCall && sendLogs) { - sendRageshakeRequest(roomId); + sendRageshakeRequest(roomId, rageshakeRequestId); } }, [inCall, submitRageshake, roomId, sendRageshakeRequest] diff --git a/src/room/RageshakeRequestModal.jsx b/src/room/RageshakeRequestModal.jsx index 2aeb5441..94243190 100644 --- a/src/room/RageshakeRequestModal.jsx +++ b/src/room/RageshakeRequestModal.jsx @@ -5,17 +5,17 @@ import { FieldRow, ErrorMessage } from "../input/Input"; import { useSubmitRageshake } from "../settings/rageshake"; import { Body } from "../typography/Typography"; -export function RageshakeRequestModal(props) { +export function RageshakeRequestModal({ rageshakeRequestId, ...rest }) { const { submitRageshake, sending, sent, error } = useSubmitRageshake(); useEffect(() => { if (sent) { - props.onClose(); + rest.onClose(); } - }, [sent, props.onClose]); + }, [sent, rest.onClose]); return ( - + Another user on this call is having an issue. In order to better @@ -23,7 +23,12 @@ export function RageshakeRequestModal(props) {