From 363ffdbde39c82f889710fc45fd6b7d0a85281fb Mon Sep 17 00:00:00 2001 From: Muhsin Keloth Date: Mon, 3 Apr 2023 12:03:58 +0530 Subject: [PATCH] fix: Disable form if pre-chat disabled on new conversation (#6813) --- app/javascript/widget/components/PreChat/Form.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue index 4f78d07f0..16a3c4ae0 100644 --- a/app/javascript/widget/components/PreChat/Form.vue +++ b/app/javascript/widget/components/PreChat/Form.vue @@ -63,12 +63,13 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin'; import { isEmptyObject } from 'widget/helpers/utils'; import routerMixin from 'widget/mixins/routerMixin'; import darkModeMixin from 'widget/mixins/darkModeMixin'; +import configMixin from 'widget/mixins/configMixin'; export default { components: { CustomButton, Spinner, }, - mixins: [routerMixin, darkModeMixin, messageFormatterMixin], + mixins: [routerMixin, darkModeMixin, messageFormatterMixin, configMixin], props: { options: { type: Object, @@ -101,7 +102,7 @@ export default { return !isEmptyObject(this.activeCampaign); }, shouldShowHeaderMessage() { - return this.hasActiveCampaign || this.options.preChatMessage; + return this.hasActiveCampaign || this.preChatFormEnabled; }, headerMessage() { if (this.hasActiveCampaign) { @@ -110,7 +111,7 @@ export default { return this.options.preChatMessage; }, preChatFields() { - return this.options?.preChatFields || []; + return this.preChatFormEnabled ? this.options.preChatFields : []; }, filteredPreChatFields() { const isUserEmailAvailable = !!this.currentUser.email;