From 1bea121dc5323d72cea75e4cb774c30caa683852 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <fayazara@gmail.com>
Date: Tue, 3 Sep 2024 01:05:59 +0530
Subject: [PATCH] Fixed rebase conflict

---
 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 6ed6cd264..eb688dd72 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -5,17 +5,17 @@ import { mapGetters } from 'vuex';
 import { getContrastingTextColor } from '@chatwoot/utils';
 import { isEmptyObject } from 'widget/helpers/utils';
 import { getRegexp } from 'shared/helpers/Validators';
-import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import useReplaceRoute from 'widget/composables/useReplaceRoute';
 import darkModeMixin from 'widget/mixins/darkModeMixin';
 import configMixin from 'widget/mixins/configMixin';
+import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
 
 export default {
   components: {
     CustomButton,
     Spinner,
   },
-  mixins: [darkModeMixin, messageFormatterMixin, configMixin],
+  mixins: [darkModeMixin, configMixin],
   props: {
     options: {
       type: Object,
@@ -23,8 +23,9 @@ export default {
     },
   },
   setup() {
+    const { formatMessage } = useMessageFormatter();
     const replaceRoute = useReplaceRoute();
-    return { replaceRoute };
+    return { replaceRoute, formatMessage };
   },
   data() {
     return {