diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue index 38bb24f8f..c6d492061 100644 --- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue +++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue @@ -114,7 +114,6 @@ import { LocalStorage } from 'shared/helpers/localStorage'; // constants import { BUS_EVENTS } from 'shared/constants/busEvents'; -import { FEATURE_FLAGS } from 'dashboard/featureFlags'; import { REPLY_POLICY } from 'shared/constants/links'; import wootConstants from 'dashboard/constants/globals'; import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage'; @@ -285,14 +284,6 @@ export default { return this.currentChat.unread_count || 0; }, inboxSupportsReplyTo() { - if ( - !this.isFeatureEnabledonAccount( - this.accountId, - FEATURE_FLAGS.MESSAGE_REPLY_TO - ) - ) { - return {}; - } return { incoming: this.inboxHasFeature(INBOX_FEATURES.REPLY_TO), outgoing: this.inboxHasFeature(INBOX_FEATURES.REPLY_TO_OUTGOING), diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue index 37c34a031..5e1f34904 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue @@ -194,7 +194,6 @@ import { replaceSignature, extractTextFromMarkdown, } from 'dashboard/helper/editorHelper'; -import { FEATURE_FLAGS } from 'dashboard/featureFlags'; import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage'; import { LocalStorage } from 'shared/helpers/localStorage'; @@ -276,11 +275,7 @@ export default { return ( this.inReplyTo?.id && !this.isPrivate && - this.inboxHasFeature(INBOX_FEATURES.REPLY_TO) && - this.isFeatureEnabledonAccount( - this.accountId, - FEATURE_FLAGS.MESSAGE_REPLY_TO - ) + this.inboxHasFeature(INBOX_FEATURES.REPLY_TO) ); }, showRichContentEditor() { diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js index 143ee521d..4280e0f10 100644 --- a/app/javascript/dashboard/featureFlags.js +++ b/app/javascript/dashboard/featureFlags.js @@ -16,6 +16,5 @@ export const FEATURE_FLAGS = { TEAM_MANAGEMENT: 'team_management', VOICE_RECORDER: 'voice_recorder', AUDIT_LOGS: 'audit_logs', - MESSAGE_REPLY_TO: 'message_reply_to', INSERT_ARTICLE_IN_REPLY: 'insert_article_in_reply', }; diff --git a/app/javascript/widget/components/AgentMessage.vue b/app/javascript/widget/components/AgentMessage.vue index e1d9ee7c4..6020af3dc 100755 --- a/app/javascript/widget/components/AgentMessage.vue +++ b/app/javascript/widget/components/AgentMessage.vue @@ -22,7 +22,6 @@
@@ -127,7 +125,6 @@ export default { data() { return { hasImageError: false, - allowReplyTo: window.chatwootWebChannel.allowReplyTo || false, }; }, computed: { @@ -217,7 +214,6 @@ export default { }; }, hasReplyTo() { - if (!this.allowReplyTo) return false; return this.replyTo && (this.replyTo.content || this.replyTo.attachments); }, }, diff --git a/app/javascript/widget/components/ChatFooter.vue b/app/javascript/widget/components/ChatFooter.vue index 33017e7c2..2a8ef36dc 100755 --- a/app/javascript/widget/components/ChatFooter.vue +++ b/app/javascript/widget/components/ChatFooter.vue @@ -68,7 +68,6 @@ export default { data() { return { inReplyTo: null, - allowReplyTo: window.chatwootWebChannel.allowReplyTo || false, }; }, computed: { @@ -91,8 +90,6 @@ export default { return this.currentUser && this.currentUser.email; }, hasReplyTo() { - if (!this.allowReplyTo) return false; - return ( this.inReplyTo && (this.inReplyTo.content || this.inReplyTo.attachments) ); diff --git a/app/javascript/widget/components/UserMessage.vue b/app/javascript/widget/components/UserMessage.vue index 1d07156ca..812d699cb 100755 --- a/app/javascript/widget/components/UserMessage.vue +++ b/app/javascript/widget/components/UserMessage.vue @@ -11,16 +11,12 @@
- + ', allowMessagesAfterResolved: <%= @web_widget.inbox.allow_messages_after_resolved %>, disableBranding: <%= @web_widget.inbox.account.feature_enabled?('disable_branding') %>, - allowReplyTo: <%= @web_widget.inbox.account.feature_enabled?('message_reply_to') %> } window.chatwootPubsubToken = '<%= @contact_inbox.pubsub_token %>' window.authToken = '<%= @token %>'