diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue index 872f68640..75410a3c4 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue @@ -5,7 +5,6 @@ import { useAlert } from 'dashboard/composables'; import { useUISettings } from 'dashboard/composables/useUISettings'; import { useTrack } from 'dashboard/composables'; import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins'; -import { FEATURE_FLAGS } from 'dashboard/featureFlags'; import ReplyToMessage from './ReplyToMessage.vue'; import AttachmentPreview from 'dashboard/components/widgets/AttachmentsPreview.vue'; @@ -144,8 +143,6 @@ export default { currentUser: 'getCurrentUser', lastEmail: 'getLastEmailInSelectedChat', globalConfig: 'globalConfig/get', - accountId: 'getCurrentAccountId', - isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount', }), currentContact() { const senderId = this.currentChat?.meta?.sender?.id; @@ -384,14 +381,8 @@ export default { const { slug = '' } = portal; return slug; }, - isQuotedEmailReplyEnabled() { - return this.isFeatureEnabledonAccount( - this.accountId, - FEATURE_FLAGS.QUOTED_EMAIL_REPLY - ); - }, quotedReplyPreference() { - if (!this.isAnEmailChannel || !this.isQuotedEmailReplyEnabled) { + if (!this.isAnEmailChannel) { return false; } @@ -416,11 +407,7 @@ export default { return truncatePreviewText(this.quotedEmailText, 80); }, shouldShowQuotedReplyToggle() { - return ( - this.isAnEmailChannel && - !this.isOnPrivateNote && - this.isQuotedEmailReplyEnabled - ); + return this.isAnEmailChannel && !this.isOnPrivateNote; }, shouldShowQuotedPreview() { return ( @@ -577,7 +564,6 @@ export default { }, shouldIncludeQuotedEmail() { return ( - this.isQuotedEmailReplyEnabled && this.quotedReplyPreference && this.shouldShowQuotedReplyToggle && !!this.quotedEmailText diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js index da296bac4..b97e30984 100644 --- a/app/javascript/dashboard/featureFlags.js +++ b/app/javascript/dashboard/featureFlags.js @@ -43,7 +43,6 @@ export const FEATURE_FLAGS = { CAPTAIN_TASKS: 'captain_tasks', CAPTAIN_DOCUMENT_AUTO_SYNC: 'captain_document_auto_sync', SAML: 'saml', - QUOTED_EMAIL_REPLY: 'quoted_email_reply', COMPANIES: 'companies', ADVANCED_SEARCH: 'advanced_search', CONVERSATION_REQUIRED_ATTRIBUTES: 'conversation_required_attributes', diff --git a/config/features.yml b/config/features.yml index 92d004f81..0814e3f9e 100644 --- a/config/features.yml +++ b/config/features.yml @@ -219,6 +219,7 @@ - name: quoted_email_reply display_name: Quoted Email Reply enabled: false + deprecated: true - name: companies display_name: Companies enabled: false diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb index 71b3cbf5a..e61198b60 100644 --- a/spec/builders/messages/message_builder_spec.rb +++ b/spec/builders/messages/message_builder_spec.rb @@ -181,10 +181,6 @@ describe Messages::MessageBuilder do end context 'when custom email content is provided' do - before do - account.enable_features('quoted_email_reply') - end - it 'creates message with custom HTML email content' do params = ActionController::Parameters.new({ content: 'Regular message content',