chore: conflict fixes

2026-01-12 15:41:07 +05:30
parent 772eeafecb
commit ead5b46620
1 changed files with 1 additions and 1 deletions
@@ -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"