From ead5b466201cda1bf13522f8092fc30a3d37c818 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 12 Jan 2026 15:41:07 +0530 Subject: [PATCH] chore: conflict fixes --- .../dashboard/components/widgets/conversation/ReplyBox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue index 1e6d2af99..c58754c1a 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue @@ -1186,6 +1186,7 @@ export default { :signature="messageSignature" allow-signature :channel-type="channelType" + :medium="inbox.medium" @typing-off="onTypingOff" @typing-on="onTypingOn" @focus="onFocus" @@ -1263,7 +1264,6 @@ export default { :recording-audio-state="recordingAudioState" :send-button-text="replyButtonLabel" :show-audio-recorder="showAudioRecorder" - :show-editor-toggle="isAPIInbox && !isOnPrivateNote" :show-emoji-picker="showEmojiPicker" :show-file-upload="showFileUpload" :show-quoted-reply-toggle="shouldShowQuotedReplyToggle"