Skip to content

Commit

Permalink
Merge branch 'master' into feat/threads-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
myandrienko authored Sep 4, 2024
2 parents 5d3f006 + 0e4a6f1 commit eebff00
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/components/MessageInput/MessageInputFlat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const MessageInputFlat = <
maxFilesLeft,
message,
numberOfUploads,
parent,
recordingController,
setCooldownRemaining,
text,
Expand Down Expand Up @@ -129,7 +130,7 @@ export const MessageInputFlat = <

// TODO: "!message" condition is a temporary fix for shared
// state when editing a message (fix shared state issue)
const displayQuotedMessage = !message && quotedMessage && !quotedMessage.parent_id;
const displayQuotedMessage = !message && quotedMessage && quotedMessage.parent_id === parent?.id;
const recordingEnabled = !!(recordingController.recorder && navigator.mediaDevices); // account for requirement on iOS as per this bug report: https://bugs.webkit.org/show_bug.cgi?id=252303
const isRecording = !!recordingController.recordingState;

Expand Down

0 comments on commit eebff00

Please sign in to comment.