From 9c31d7c672d4f9743ce3a18910d905fe841be7cf Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 12 Jan 2022 02:55:27 -0800
Subject: [PATCH 001/101] feat: Use vue-router on widget route management
 (#3415)

* feat: Add vue-router to widget

Co-authored-by: Pranav <pranav@chatwoot.com>

* Move to dynamic imports

* Move to routerMixin

* Fix popup button display

* Remove unnecessary import

* router -> route

* Fix open state

* Fix issues

* Remove used CSS

* Fix specs

* Fix specs

* Fix widgetColor specs

* Fix mutation specs

* Fixes broken lint errors

* Fixes issues with widget flow

Co-authored-by: Nithin <nithin@chatwoot.com>
Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../dashboard/components/widgets/Avatar.vue   |   4 +-
 app/javascript/packs/widget.js                |   2 +
 app/javascript/sdk/IFrameHelper.js            |  48 ++--
 .../shared/components/FluentIcon/icons.json   |   1 +
 app/javascript/widget/App.vue                 | 188 +++++++--------
 app/javascript/widget/assets/scss/woot.scss   |   7 -
 .../widget/components/ChatFooter.vue          |  64 +++--
 .../widget/components/ChatHeader.vue          |  75 +++---
 .../widget/components/ChatHeaderExpanded.vue  |  20 +-
 .../widget/components/ChatInputWrap.vue       |  10 +-
 .../widget/components/HeaderActions.vue       |   4 +-
 .../widget/components/PreChat/Form.vue        |  35 ++-
 .../widget/components/TeamAvailability.vue    |  10 +-
 .../widget/components/UnreadMessage.vue       |   8 +-
 .../UnreadMessageList.vue}                    |  69 ++----
 .../components/layouts/ViewWithHeader.vue     | 118 ++++++++++
 .../widget/constants/widgetBusEvents.js       |   3 +
 app/javascript/widget/helpers/actionCable.js  |   5 +-
 app/javascript/widget/i18n/locale/en.json     |   1 +
 app/javascript/widget/mixins/configMixin.js   |   6 +-
 app/javascript/widget/mixins/routerMixin.js   |  10 +
 app/javascript/widget/router.js               |  44 ++--
 .../widget/store/modules/appConfig.js         |  43 +++-
 .../widget/store/modules/campaign.js          |  28 ++-
 app/javascript/widget/store/modules/events.js |  14 +-
 .../modules/specs/agent/mutations.spec.js     |   2 +-
 .../modules/specs/appConfig/actions.spec.js   |   6 +-
 .../modules/specs/appConfig/mutations.spec.js |   2 +-
 .../modules/specs/campaign/actions.spec.js    |  51 +++-
 .../modules/specs/campaign/getters.spec.js    |  13 --
 .../modules/specs/campaign/mutations.spec.js  |  16 --
 app/javascript/widget/store/types.js          |  11 +-
 app/javascript/widget/views/Campaigns.vue     |  28 +++
 app/javascript/widget/views/Home.vue          | 218 ++----------------
 app/javascript/widget/views/Messages.vue      |  27 +++
 app/javascript/widget/views/PreChatForm.vue   |  49 ++++
 app/javascript/widget/views/Router.vue        |  82 -------
 .../widget/views/UnreadMessages.vue           |  20 ++
 38 files changed, 617 insertions(+), 725 deletions(-)
 rename app/javascript/widget/{views/Unread.vue => components/UnreadMessageList.vue} (68%)
 create mode 100644 app/javascript/widget/components/layouts/ViewWithHeader.vue
 create mode 100644 app/javascript/widget/constants/widgetBusEvents.js
 create mode 100644 app/javascript/widget/mixins/routerMixin.js
 create mode 100644 app/javascript/widget/views/Campaigns.vue
 create mode 100644 app/javascript/widget/views/Messages.vue
 create mode 100644 app/javascript/widget/views/PreChatForm.vue
 delete mode 100644 app/javascript/widget/views/Router.vue
 create mode 100644 app/javascript/widget/views/UnreadMessages.vue

diff --git a/app/javascript/dashboard/components/widgets/Avatar.vue b/app/javascript/dashboard/components/widgets/Avatar.vue
index 9a409f18b..1d67842a2 100644
--- a/app/javascript/dashboard/components/widgets/Avatar.vue
+++ b/app/javascript/dashboard/components/widgets/Avatar.vue
@@ -18,11 +18,11 @@ export default {
     },
     backgroundColor: {
       type: String,
-      default: 'white',
+      default: '#c2e1ff',
     },
     color: {
       type: String,
-      default: '',
+      default: '#1976cc',
     },
     customStyle: {
       type: Object,
diff --git a/app/javascript/packs/widget.js b/app/javascript/packs/widget.js
index 7aeaf4545..f9f57e2ef 100644
--- a/app/javascript/packs/widget.js
+++ b/app/javascript/packs/widget.js
@@ -7,6 +7,7 @@ import ActionCableConnector from '../widget/helpers/actionCable';
 import { getAlertAudio } from 'shared/helpers/AudioNotificationHelper';
 import i18n from '../widget/i18n';
 
+import router from '../widget/router';
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
 
@@ -22,6 +23,7 @@ Vue.config.productionTip = false;
 
 window.onload = () => {
   window.WOOT_WIDGET = new Vue({
+    router,
     store,
     i18n: i18nConfig,
     render: h => h(App),
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index ff9bcca91..e10feac6d 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -150,11 +150,14 @@ export const IFrameHelper = {
       onBubbleClick(bubbleState);
     },
 
+    closeWindow: () => {
+      onBubbleClick({ toggleValue: false });
+      removeUnreadClass();
+    },
+
     onBubbleToggle: isOpen => {
       IFrameHelper.sendMessage('toggle-open', { isOpen });
-      if (!isOpen) {
-        IFrameHelper.events.resetUnreadMode();
-      } else {
+      if (isOpen) {
         IFrameHelper.pushEvent('webwidget.triggered');
       }
     },
@@ -164,28 +167,6 @@ export const IFrameHelper = {
         referrerHost,
       });
     },
-
-    setUnreadMode: message => {
-      const { unreadMessageCount } = message;
-      const { isOpen } = window.$chatwoot;
-      const toggleValue = true;
-
-      if (!isOpen && unreadMessageCount > 0) {
-        IFrameHelper.sendMessage('set-unread-view');
-        onBubbleClick({ toggleValue });
-        addUnreadClass();
-      }
-    },
-
-    setCampaignMode: () => {
-      const { isOpen } = window.$chatwoot;
-      const toggleValue = true;
-      if (!isOpen) {
-        onBubbleClick({ toggleValue });
-        addUnreadClass();
-      }
-    },
-
     updateIframeHeight: message => {
       const { extraHeight = 0, isFixedHeight } = message;
       if (!extraHeight) return;
@@ -193,11 +174,12 @@ export const IFrameHelper = {
       IFrameHelper.setFrameHeightToFitContent(extraHeight, isFixedHeight);
     },
 
-    resetUnreadMode: () => {
-      IFrameHelper.sendMessage('unset-unread-view');
-      removeUnreadClass();
+    setUnreadMode: () => {
+      addUnreadClass();
+      onBubbleClick({ toggleValue: true });
     },
 
+    resetUnreadMode: () => removeUnreadClass(),
     handleNotificationDot: event => {
       if (window.$chatwoot.hideMessageBubble) {
         return;
@@ -253,14 +235,10 @@ export const IFrameHelper = {
     }
   },
   toggleCloseButton: () => {
+    let isMobile = false;
     if (window.matchMedia('(max-width: 668px)').matches) {
-      IFrameHelper.sendMessage('toggle-close-button', {
-        showClose: true,
-      });
-    } else {
-      IFrameHelper.sendMessage('toggle-close-button', {
-        showClose: false,
-      });
+      isMobile = true;
     }
+    IFrameHelper.sendMessage('toggle-close-button', { isMobile });
   },
 };
diff --git a/app/javascript/shared/components/FluentIcon/icons.json b/app/javascript/shared/components/FluentIcon/icons.json
index f3dc089b7..62798657d 100644
--- a/app/javascript/shared/components/FluentIcon/icons.json
+++ b/app/javascript/shared/components/FluentIcon/icons.json
@@ -2,6 +2,7 @@
   "arrow-clockwise-outline": "M12 4.75a7.25 7.25 0 1 0 7.201 6.406c-.068-.588.358-1.156.95-1.156.515 0 .968.358 1.03.87a9.25 9.25 0 1 1-3.432-6.116V4.25a1 1 0 1 1 2.001 0v2.698l.034.052h-.034v.25a1 1 0 0 1-1 1h-3a1 1 0 1 1 0-2h.666A7.219 7.219 0 0 0 12 4.75Z",
   "arrow-right-outline": "M13.267 4.209a.75.75 0 0 0-1.034 1.086l6.251 5.955H3.75a.75.75 0 0 0 0 1.5h14.734l-6.251 5.954a.75.75 0 0 0 1.034 1.087l7.42-7.067a.996.996 0 0 0 .3-.58.758.758 0 0 0-.001-.29.995.995 0 0 0-.3-.578l-7.419-7.067Z",
   "attach-outline": "M11.772 3.743a6 6 0 0 1 8.66 8.302l-.19.197-8.8 8.798-.036.03a3.723 3.723 0 0 1-5.489-4.973.764.764 0 0 1 .085-.13l.054-.06.086-.088.142-.148.002.003 7.436-7.454a.75.75 0 0 1 .977-.074l.084.073a.75.75 0 0 1 .074.976l-.073.084-7.594 7.613a2.23 2.23 0 0 0 3.174 3.106l8.832-8.83A4.502 4.502 0 0 0 13 4.644l-.168.16-.013.014-9.536 9.536a.75.75 0 0 1-1.133-.977l.072-.084 9.549-9.55h.002Z",
+  "chevron-left-outline": "M15.53 4.22a.75.75 0 0 1 0 1.06L8.81 12l6.72 6.72a.75.75 0 1 1-1.06 1.06l-7.25-7.25a.75.75 0 0 1 0-1.06l7.25-7.25a.75.75 0 0 1 1.06 0Z",
   "chevron-right-outline": "M8.293 4.293a1 1 0 0 0 0 1.414L14.586 12l-6.293 6.293a1 1 0 1 0 1.414 1.414l7-7a1 1 0 0 0 0-1.414l-7-7a1 1 0 0 0-1.414 0Z",
   "dismiss-outline": "m4.397 4.554.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l6.47-6.47a.75.75 0 1 1 1.06 1.061L13.061 12l6.47 6.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-6.47 6.47a.75.75 0 0 1-1.06-1.061L10.939 12l-6.47-6.47a.75.75 0 0 1-.072-.976l.073-.084-.073.084Z",
   "document-outline": "M18.5 20a.5.5 0 0 1-.5.5H6a.5.5 0 0 1-.5-.5V4a.5.5 0 0 1 .5-.5h6V8a2 2 0 0 0 2 2h4.5v10Zm-5-15.379L17.378 8.5H14a.5.5 0 0 1-.5-.5V4.621Zm5.914 3.793-5.829-5.828c-.026-.026-.058-.046-.085-.07a2.072 2.072 0 0 0-.219-.18c-.04-.027-.086-.045-.128-.068-.071-.04-.141-.084-.216-.116a1.977 1.977 0 0 0-.624-.138C12.266 2.011 12.22 2 12.172 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9.828a2 2 0 0 0-.586-1.414Z",
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 818ef6db4..6a4d4d7ec 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -1,61 +1,67 @@
 <template>
-  <router
-    :show-unread-view="showUnreadView"
-    :show-campaign-view="showCampaignView"
-    :is-mobile="isMobile"
-    :has-fetched="hasFetched"
-    :unread-message-count="unreadMessageCount"
-    :is-left-aligned="isLeftAligned"
-    :hide-message-bubble="hideMessageBubble"
-    :show-popout-button="showPopoutButton"
-    :is-campaign-view-clicked="isCampaignViewClicked"
-  />
+  <div
+    v-if="!conversationSize && isFetchingList"
+    class="flex flex-1 items-center h-full bg-black-25 justify-center"
+  >
+    <spinner size="" />
+  </div>
+  <div
+    v-else
+    class="flex flex-col justify-end h-full"
+    :class="{
+      'is-mobile': isMobile,
+      'is-widget-right': isRightAligned,
+      'is-bubble-hidden': hideMessageBubble,
+    }"
+  >
+    <router-view></router-view>
+  </div>
 </template>
 
 <script>
-import { mapGetters, mapActions, mapMutations } from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import { setHeader } from 'widget/helpers/axios';
 import { IFrameHelper, RNHelper } from 'widget/helpers/utils';
 import configMixin from './mixins/configMixin';
 import availabilityMixin from 'widget/mixins/availability';
-import Router from './views/Router';
 import { getLocale } from './helpers/urlParamsHelper';
 import { isEmptyObject } from 'widget/helpers/utils';
+import Spinner from 'shared/components/Spinner.vue';
+import routerMixin from './mixins/routerMixin';
 import {
   getExtraSpaceToScroll,
   loadedEventConfig,
 } from './helpers/IframeEventHelper';
+import {
+  ON_AGENT_MESSAGE_RECEIVED,
+  ON_CAMPAIGN_MESSAGE_CLICK,
+  ON_UNREAD_MESSAGE_CLICK,
+} from './constants/widgetBusEvents';
 export default {
   name: 'App',
   components: {
-    Router,
+    Spinner,
   },
-  mixins: [availabilityMixin, configMixin],
+  mixins: [availabilityMixin, configMixin, routerMixin],
   data() {
     return {
-      showUnreadView: false,
-      showCampaignView: false,
       isMobile: false,
-      hideMessageBubble: false,
-      widgetPosition: 'right',
-      showPopoutButton: false,
-      isWebWidgetTriggered: false,
-      isCampaignViewClicked: false,
-      isWidgetOpen: false,
     };
   },
   computed: {
     ...mapGetters({
+      activeCampaign: 'campaign/getActiveCampaign',
+      campaigns: 'campaign/getCampaigns',
+      conversationSize: 'conversation/getConversationSize',
+      currentUser: 'contacts/getCurrentUser',
       hasFetched: 'agent/getHasFetched',
+      hideMessageBubble: 'appConfig/getHideMessageBubble',
+      isFetchingList: 'conversation/getIsFetchingList',
+      isRightAligned: 'appConfig/isRightAligned',
+      isWidgetOpen: 'appConfig/getIsWidgetOpen',
       messageCount: 'conversation/getMessageCount',
       unreadMessageCount: 'conversation/getUnreadMessageCount',
-      campaigns: 'campaign/getCampaigns',
-      activeCampaign: 'campaign/getActiveCampaign',
     }),
-    isLeftAligned() {
-      const isLeft = this.widgetPosition === 'left';
-      return isLeft;
-    },
     isIFrame() {
       return IFrameHelper.isIFrame();
     },
@@ -67,20 +73,11 @@ export default {
     activeCampaign() {
       this.setCampaignView();
     },
-    showUnreadView(newVal) {
-      if (newVal) {
-        this.setIframeHeight(this.isMobile);
-      }
-    },
-    showCampaignView(newVal) {
-      if (newVal) {
-        this.setIframeHeight(this.isMobile);
-      }
-    },
   },
   mounted() {
-    const { websiteToken, locale } = window.chatwootWebChannel;
+    const { websiteToken, locale, widgetColor } = window.chatwootWebChannel;
     this.setLocale(locale);
+    this.setWidgetColor(widgetColor);
     if (this.isIFrame) {
       this.registerListeners();
       this.sendLoadedEvent();
@@ -96,12 +93,15 @@ export default {
       this.sendRNWebViewLoadedEvent();
     }
     this.$store.dispatch('conversationAttributes/getAttributes');
-    this.setWidgetColor(window.chatwootWebChannel);
     this.registerUnreadEvents();
     this.registerCampaignEvents();
   },
   methods: {
-    ...mapActions('appConfig', ['setWidgetColor', 'setReferrerHost']),
+    ...mapActions('appConfig', [
+      'setAppConfig',
+      'setReferrerHost',
+      'setWidgetColor',
+    ]),
     ...mapActions('conversation', ['fetchOldConversations', 'setUserLastSeen']),
     ...mapActions('campaign', [
       'initCampaigns',
@@ -109,7 +109,6 @@ export default {
       'resetCampaign',
     ]),
     ...mapActions('agent', ['fetchAvailableAgents']),
-    ...mapMutations('events', ['toggleOpen']),
     scrollConversationToBottom() {
       const container = this.$el.querySelector('.conversation-wrap');
       container.scrollTop = container.scrollHeight;
@@ -136,68 +135,48 @@ export default {
         this.$root.$i18n.locale = locale;
       }
     },
-    setPosition(position) {
-      const widgetPosition = position || 'right';
-      this.widgetPosition = widgetPosition;
-    },
-    setHideMessageBubble(hideBubble) {
-      this.hideMessageBubble = !!hideBubble;
-    },
     registerUnreadEvents() {
-      bus.$on('on-agent-message-received', () => {
-        if (!this.isIFrame || this.isWidgetOpen) {
-          this.setUserLastSeen();
-        }
-        this.setUnreadView();
-      });
-      bus.$on('on-unread-view-clicked', () => {
-        this.unsetUnreadView();
-        this.setUserLastSeen();
+      bus.$on(ON_AGENT_MESSAGE_RECEIVED, this.setUnreadView);
+      bus.$on(ON_UNREAD_MESSAGE_CLICK, () => {
+        this.replaceRoute('messages').then(() => this.unsetUnreadView());
       });
     },
     registerCampaignEvents() {
-      bus.$on('on-campaign-view-clicked', () => {
-        this.isCampaignViewClicked = true;
-        this.showCampaignView = false;
-        this.showUnreadView = false;
-        this.unsetUnreadView();
-        this.setUserLastSeen();
-        // Execute campaign only if pre-chat form (and require email too) is not enabled
-        if (
-          !(this.preChatFormEnabled && this.preChatFormOptions.requireEmail)
-        ) {
+      bus.$on(ON_CAMPAIGN_MESSAGE_CLICK, () => {
+        const showPreChatForm =
+          this.preChatFormEnabled && this.preChatFormOptions.requireEmail;
+        const isUserEmailAvailable = !!this.currentUser.email;
+        if (showPreChatForm && !isUserEmailAvailable) {
+          this.replaceRoute('prechat-form');
+        } else {
+          this.replaceRoute('messages');
           bus.$emit('execute-campaign', this.activeCampaign.id);
         }
+        this.unsetUnreadView();
       });
       bus.$on('execute-campaign', campaignId => {
         const { websiteToken } = window.chatwootWebChannel;
         this.executeCampaign({ campaignId, websiteToken });
+        this.replaceRoute('messages');
       });
     },
-
-    setPopoutDisplay(showPopoutButton) {
-      this.showPopoutButton = showPopoutButton;
-    },
     setCampaignView() {
       const { messageCount, activeCampaign } = this;
       const isCampaignReadyToExecute =
-        !isEmptyObject(activeCampaign) &&
-        !messageCount &&
-        !this.isWebWidgetTriggered;
+        !isEmptyObject(activeCampaign) && !messageCount;
       if (this.isIFrame && isCampaignReadyToExecute) {
-        this.showCampaignView = true;
-        IFrameHelper.sendMessage({
-          event: 'setCampaignMode',
+        this.replaceRoute('campaigns').then(() => {
+          this.setIframeHeight(this.isMobile);
+          IFrameHelper.sendMessage({ event: 'setUnreadMode' });
         });
-        this.setIframeHeight(this.isMobile);
       }
     },
     setUnreadView() {
       const { unreadMessageCount } = this;
-      if (this.isIFrame && unreadMessageCount > 0) {
-        IFrameHelper.sendMessage({
-          event: 'setUnreadMode',
-          unreadMessageCount,
+      if (this.isIFrame && unreadMessageCount > 0 && !this.isWidgetOpen) {
+        this.replaceRoute('unread-messages').then(() => {
+          this.setIframeHeight(this.isMobile);
+          IFrameHelper.sendMessage({ event: 'setUnreadMode' });
         });
         this.setIframeHeight(this.isMobile);
         this.handleUnreadNotificationDot();
@@ -222,14 +201,12 @@ export default {
     createWidgetEvents(message) {
       const { eventName } = message;
       const isWidgetTriggerEvent = eventName === 'webwidget.triggered';
-      this.isWebWidgetTriggered = true;
       if (
         isWidgetTriggerEvent &&
-        (this.showUnreadView || this.showCampaignView)
+        ['unread-messages', 'campaigns'].includes(this.$route.name)
       ) {
         return;
       }
-      this.setUserLastSeen();
       this.$store.dispatch('events/create', { name: eventName });
     },
     registerListeners() {
@@ -242,11 +219,9 @@ export default {
         if (message.event === 'config-set') {
           this.setLocale(message.locale);
           this.setBubbleLabel();
-          this.setPosition(message.position);
           this.fetchOldConversations().then(() => this.setUnreadView());
-          this.setPopoutDisplay(message.showPopoutButton);
           this.fetchAvailableAgents(websiteToken);
-          this.setHideMessageBubble(message.hideMessageBubble);
+          this.setAppConfig(message);
           this.$store.dispatch('contacts/get');
         } else if (message.event === 'widget-visible') {
           this.scrollConversationToBottom();
@@ -260,7 +235,7 @@ export default {
           window.referrerURL = referrerURL;
           this.setReferrerHost(referrerHost);
         } else if (message.event === 'toggle-close-button') {
-          this.isMobile = message.showClose;
+          this.isMobile = message.isMobile;
         } else if (message.event === 'push-event') {
           this.createWidgetEvents(message);
         } else if (message.event === 'set-label') {
@@ -282,20 +257,27 @@ export default {
         } else if (message.event === 'set-locale') {
           this.setLocale(message.locale);
           this.setBubbleLabel();
-        } else if (message.event === 'set-unread-view') {
-          this.showUnreadView = true;
-          this.showCampaignView = false;
-        } else if (message.event === 'unset-unread-view') {
-          // Reset campaign, If widget opened via clciking on bubble button
-          if (!this.isCampaignViewClicked) {
+        } else if (message.event === 'toggle-open') {
+          this.$store.dispatch('appConfig/toggleWidgetOpen', message.isOpen);
+
+          if (
+            ['home'].includes(this.$route.name) &&
+            message.isOpen &&
+            this.messageCount
+          ) {
+            this.replaceRoute('messages');
+          }
+          if (
+            !message.isOpen &&
+            ['unread-messages', 'campaigns'].includes(this.$route.name)
+          ) {
+            this.$store.dispatch('conversation/setUserLastSeen');
+            this.unsetUnreadView();
+            this.replaceRoute('home');
+          }
+          if (!message.isOpen) {
             this.resetCampaign();
           }
-          this.showUnreadView = false;
-          this.showCampaignView = false;
-          this.handleUnreadNotificationDot();
-        } else if (message.event === 'toggle-open') {
-          this.isWidgetOpen = message.isOpen;
-          this.toggleOpen();
         }
       });
     },
diff --git a/app/javascript/widget/assets/scss/woot.scss b/app/javascript/widget/assets/scss/woot.scss
index 90948ddaa..29d5851fa 100755
--- a/app/javascript/widget/assets/scss/woot.scss
+++ b/app/javascript/widget/assets/scss/woot.scss
@@ -19,13 +19,6 @@ body {
   height: 100%;
 }
 
-.woot-widget-wrap {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  justify-content: flex-end;
-}
-
 .is-mobile {
   display: block;
 
diff --git a/app/javascript/widget/components/ChatFooter.vue b/app/javascript/widget/components/ChatFooter.vue
index 7561f1930..f399ff252 100755
--- a/app/javascript/widget/components/ChatFooter.vue
+++ b/app/javascript/widget/components/ChatFooter.vue
@@ -1,30 +1,31 @@
 <template>
-  <div>
-    <footer v-if="!hideReplyBox" class="footer">
-      <ChatInputWrap
-        :on-send-message="handleSendMessage"
-        :on-send-attachment="handleSendAttachment"
-      />
-    </footer>
-    <div v-else>
-      <custom-button
-        class="font-medium"
-        block
-        :bg-color="widgetColor"
-        :text-color="textColor"
-        @click="startNewConversation"
-      >
-        {{ $t('START_NEW_CONVERSATION') }}
-      </custom-button>
-      <custom-button
-        v-if="showEmailTranscriptButton"
-        type="clear"
-        class="font-normal"
-        @click="sendTranscript"
-      >
-        {{ $t('EMAIL_TRANSCRIPT.BUTTON_TEXT') }}
-      </custom-button>
-    </div>
+  <footer
+    v-if="!hideReplyBox"
+    class="shadow-sm rounded-lg bg-white mb-1 z-50 relative"
+  >
+    <chat-input-wrap
+      :on-send-message="handleSendMessage"
+      :on-send-attachment="handleSendAttachment"
+    />
+  </footer>
+  <div v-else>
+    <custom-button
+      class="font-medium"
+      block
+      :bg-color="widgetColor"
+      :text-color="textColor"
+      @click="startNewConversation"
+    >
+      {{ $t('START_NEW_CONVERSATION') }}
+    </custom-button>
+    <custom-button
+      v-if="showEmailTranscriptButton"
+      type="clear"
+      class="font-normal"
+      @click="sendTranscript"
+    >
+      {{ $t('EMAIL_TRANSCRIPT.BUTTON_TEXT') }}
+    </custom-button>
   </div>
 </template>
 
@@ -115,19 +116,8 @@ export default {
   },
 };
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped lang="scss">
 @import '~widget/assets/scss/variables.scss';
-@import '~widget/assets/scss/mixins.scss';
-
-.footer {
-  background: $color-white;
-  box-sizing: border-box;
-  width: 100%;
-  border-radius: 7px;
-  @include shadow-big;
-}
 
 .branding {
   align-items: center;
diff --git a/app/javascript/widget/components/ChatHeader.vue b/app/javascript/widget/components/ChatHeader.vue
index c075222d5..23e101f11 100644
--- a/app/javascript/widget/components/ChatHeader.vue
+++ b/app/javascript/widget/components/ChatHeader.vue
@@ -1,9 +1,12 @@
 <template>
-  <header class="header-collapsed">
-    <div class="header-branding">
+  <header class="flex justify-between p-5 w-full">
+    <div class="flex items-center">
+      <button v-if="showBackButton" @click="onBackButtonClick">
+        <fluent-icon icon="chevron-left" size="24" />
+      </button>
       <img
         v-if="avatarUrl"
-        class="inbox--avatar mr-3"
+        class="h-8 w-8 rounded-full mr-3"
         :src="avatarUrl"
         alt="avatar"
       />
@@ -12,14 +15,13 @@
           <span class="mr-1" v-html="title" />
           <div
             :class="
-              `status-view--badge rounded-full leading-4 ${
-                isOnline ? 'bg-green-500' : 'hidden'
-              }`
+              `h-2 w-2 rounded-full leading-4
+              ${isOnline ? 'bg-green-500' : 'hidden'}`
             "
           />
         </div>
         <div class="text-xs mt-1 text-black-700">
-          {{ replyWaitMeessage }}
+          {{ replyWaitMessage }}
         </div>
       </div>
     </div>
@@ -29,15 +31,19 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import HeaderActions from './HeaderActions';
+
 import availabilityMixin from 'widget/mixins/availability';
+import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+import HeaderActions from './HeaderActions';
+import routerMixin from 'widget/mixins/routerMixin';
 
 export default {
   name: 'ChatHeader',
   components: {
+    FluentIcon,
     HeaderActions,
   },
-  mixins: [availabilityMixin],
+  mixins: [availabilityMixin, routerMixin],
   props: {
     avatarUrl: {
       type: String,
@@ -51,15 +57,17 @@ export default {
       type: Boolean,
       default: false,
     },
+    showBackButton: {
+      type: Boolean,
+      default: false,
+    },
     availableAgents: {
       type: Array,
       default: () => {},
     },
   },
   computed: {
-    ...mapGetters({
-      widgetColor: 'appConfig/getWidgetColor',
-    }),
+    ...mapGetters({ widgetColor: 'appConfig/getWidgetColor' }),
     isOnline() {
       const { workingHoursEnabled } = this.channelConfig;
       const anyAgentOnline = this.availableAgents.length > 0;
@@ -69,47 +77,16 @@ export default {
       }
       return anyAgentOnline;
     },
-    replyWaitMeessage() {
+    replyWaitMessage() {
       return this.isOnline
         ? this.replyTimeStatus
         : this.$t('TEAM_AVAILABILITY.OFFLINE');
     },
   },
+  methods: {
+    onBackButtonClick() {
+      this.replaceRoute('home');
+    },
+  },
 };
 </script>
-
-<style scoped lang="scss">
-@import '~widget/assets/scss/variables.scss';
-@import '~widget/assets/scss/mixins.scss';
-
-.header-collapsed {
-  display: flex;
-  justify-content: space-between;
-  padding: $space-two $space-medium;
-  width: 100%;
-  box-sizing: border-box;
-
-  .header-branding {
-    display: flex;
-    align-items: center;
-
-    img {
-      border-radius: 50%;
-    }
-  }
-
-  .title {
-    font-weight: $font-weight-medium;
-  }
-
-  .inbox--avatar {
-    height: 32px;
-    width: 32px;
-  }
-}
-
-.status-view--badge {
-  height: $space-small;
-  width: $space-small;
-}
-</style>
diff --git a/app/javascript/widget/components/ChatHeaderExpanded.vue b/app/javascript/widget/components/ChatHeaderExpanded.vue
index f80b1b8ab..fc4aab125 100755
--- a/app/javascript/widget/components/ChatHeaderExpanded.vue
+++ b/app/javascript/widget/components/ChatHeaderExpanded.vue
@@ -1,14 +1,14 @@
 <template>
-  <header class="header-expanded bg-white py-8 px-6 relative box-border w-full">
+  <header class="header-expanded bg-white py-6 px-5 relative box-border w-full">
     <div
       class="flex items-start"
       :class="[avatarUrl ? 'justify-between' : 'justify-end']"
     >
-      <img v-if="avatarUrl" class="logo" :src="avatarUrl" />
+      <img v-if="avatarUrl" class="h-12 rounded-full" :src="avatarUrl" />
       <header-actions :show-popout-button="showPopoutButton" />
     </div>
     <h2
-      class="text-slate-900 mt-6 text-4xl mb-3 font-normal"
+      class="text-slate-900 mt-5 text-3xl mb-3 font-normal"
       v-html="introHeading"
     />
     <p class="text-lg text-black-700 leading-normal" v-html="introBody" />
@@ -48,17 +48,3 @@ export default {
   },
 };
 </script>
-
-<style scoped lang="scss">
-@import '~widget/assets/scss/mixins.scss';
-
-$logo-size: 56px;
-
-.header-expanded {
-  .logo {
-    width: $logo-size;
-    height: $logo-size;
-    border-radius: $logo-size;
-  }
-}
-</style>
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index c7eb0c900..e9f00773e 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -90,6 +90,7 @@ export default {
   computed: {
     ...mapGetters({
       widgetColor: 'appConfig/getWidgetColor',
+      isWidgetOpen: 'appConfig/getIsWidgetOpen',
     }),
     showAttachment() {
       return this.hasAttachmentsEnabled && this.userInput.length === 0;
@@ -97,13 +98,10 @@ export default {
     showSendButton() {
       return this.userInput.length > 0;
     },
-    isOpen() {
-      return this.$store.state.events.isOpen;
-    },
   },
   watch: {
-    isOpen(isOpen) {
-      if (isOpen) {
+    isWidgetOpen(isWidgetOpen) {
+      if (isWidgetOpen) {
         this.focusInput();
       }
     },
@@ -113,7 +111,7 @@ export default {
   },
   mounted() {
     document.addEventListener('keypress', this.handleEnterKeyPress);
-    if (this.isOpen) {
+    if (this.isWidgetOpen) {
       this.focusInput();
     }
   },
diff --git a/app/javascript/widget/components/HeaderActions.vue b/app/javascript/widget/components/HeaderActions.vue
index 348064a39..b9fb76ff7 100644
--- a/app/javascript/widget/components/HeaderActions.vue
+++ b/app/javascript/widget/components/HeaderActions.vue
@@ -67,9 +67,7 @@ export default {
     },
     closeWindow() {
       if (IFrameHelper.isIFrame()) {
-        IFrameHelper.sendMessage({
-          event: 'toggleBubble',
-        });
+        IFrameHelper.sendMessage({ event: 'closeWindow' });
       } else if (RNHelper.isRNWebView) {
         RNHelper.sendMessage({ type: 'close-widget' });
       }
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index 157c1f233..c053a58f6 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -34,7 +34,7 @@
       "
     />
     <form-text-area
-      v-if="!activeCampaignExist"
+      v-if="!hasActiveCampaign"
       v-model="message"
       class="my-5"
       :label="$t('PRE_CHAT_FORM.FIELDS.MESSAGE.LABEL')"
@@ -63,7 +63,7 @@ import { mapGetters } from 'vuex';
 import { getContrastingTextColor } from '@chatwoot/utils';
 import { required, minLength, email } from 'vuelidate/lib/validators';
 import { isEmptyObject } from 'widget/helpers/utils';
-
+import routerMixin from 'widget/mixins/routerMixin';
 export default {
   components: {
     FormInput,
@@ -71,6 +71,7 @@ export default {
     CustomButton,
     Spinner,
   },
+  mixins: [routerMixin],
   props: {
     options: {
       type: Object,
@@ -95,7 +96,7 @@ export default {
       },
     };
     // For campaign, message field is not required
-    if (this.activeCampaignExist) {
+    if (this.hasActiveCampaign) {
       return identityValidations;
     }
     if (this.options.requireEmail) {
@@ -122,14 +123,14 @@ export default {
     textColor() {
       return getContrastingTextColor(this.widgetColor);
     },
-    activeCampaignExist() {
+    hasActiveCampaign() {
       return !isEmptyObject(this.activeCampaign);
     },
     shouldShowHeaderMessage() {
-      return this.activeCampaignExist || this.options.preChatMessage;
+      return this.hasActiveCampaign || this.options.preChatMessage;
     },
     headerMessage() {
-      if (this.activeCampaignExist) {
+      if (this.hasActiveCampaign) {
         return this.$t('PRE_CHAT_FORM.CAMPAIGN_HEADER');
       }
       return this.options.preChatMessage;
@@ -141,22 +142,12 @@ export default {
       if (this.$v.$invalid) {
         return;
       }
-      // Check any active campaign exist or not
-      if (this.activeCampaignExist) {
-        bus.$emit('execute-campaign', this.activeCampaign.id);
-        this.$store.dispatch('contacts/update', {
-          user: {
-            email: this.emailAddress,
-            name: this.fullName,
-          },
-        });
-      } else {
-        this.$store.dispatch('conversation/createConversation', {
-          fullName: this.fullName,
-          emailAddress: this.emailAddress,
-          message: this.message,
-        });
-      }
+      this.$emit('submit', {
+        fullName: this.fullName,
+        emailAddress: this.emailAddress,
+        message: this.message,
+        activeCampaignId: this.activeCampaign.id,
+      });
     },
   },
 };
diff --git a/app/javascript/widget/components/TeamAvailability.vue b/app/javascript/widget/components/TeamAvailability.vue
index 41c389ae2..b0c7d9f7e 100644
--- a/app/javascript/widget/components/TeamAvailability.vue
+++ b/app/javascript/widget/components/TeamAvailability.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="px-4">
+  <div class="px-5">
     <div class="flex items-center justify-between mb-4">
       <div class="text-black-700">
         <div class="text-base leading-5 font-medium mb-1">
@@ -22,7 +22,9 @@
       :text-color="textColor"
       @click="startConversation"
     >
-      {{ $t('START_CONVERSATION') }}
+      {{
+        hasConversation ? $t('CONTINUE_CONVERSATION') : $t('START_CONVERSATION')
+      }}
     </custom-button>
   </div>
 </template>
@@ -47,6 +49,10 @@ export default {
       type: Array,
       default: () => {},
     },
+    hasConversation: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     ...mapGetters({ widgetColor: 'appConfig/getWidgetColor' }),
diff --git a/app/javascript/widget/components/UnreadMessage.vue b/app/javascript/widget/components/UnreadMessage.vue
index 48a6b4686..13e8fc250 100644
--- a/app/javascript/widget/components/UnreadMessage.vue
+++ b/app/javascript/widget/components/UnreadMessage.vue
@@ -21,6 +21,10 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 import configMixin from '../mixins/configMixin';
 import { isEmptyObject } from 'widget/helpers/utils';
+import {
+  ON_CAMPAIGN_MESSAGE_CLICK,
+  ON_UNREAD_MESSAGE_CLICK,
+} from '../constants/widgetBusEvents';
 export default {
   name: 'UnreadMessage',
   components: { Thumbnail },
@@ -82,9 +86,9 @@ export default {
     },
     onClickMessage() {
       if (this.campaignId) {
-        bus.$emit('on-campaign-view-clicked', this.campaignId);
+        bus.$emit(ON_CAMPAIGN_MESSAGE_CLICK, this.campaignId);
       } else {
-        bus.$emit('on-unread-view-clicked');
+        bus.$emit(ON_UNREAD_MESSAGE_CLICK);
       }
     },
   },
diff --git a/app/javascript/widget/views/Unread.vue b/app/javascript/widget/components/UnreadMessageList.vue
similarity index 68%
rename from app/javascript/widget/views/Unread.vue
rename to app/javascript/widget/components/UnreadMessageList.vue
index 7eafbdbe2..a3368d4e9 100644
--- a/app/javascript/widget/views/Unread.vue
+++ b/app/javascript/widget/components/UnreadMessageList.vue
@@ -1,20 +1,16 @@
 <template>
   <div class="unread-wrap">
     <div class="close-unread-wrap">
-      <button
-        v-if="showCloseButton"
-        class="button small close-unread-button"
-        @click="closeFullView"
-      >
-        <div class="flex items-center">
+      <button class="button small close-unread-button" @click="closeFullView">
+        <span class="flex items-center">
           <fluent-icon class="mr-1" icon="dismiss" size="12" />
           {{ $t('UNREAD_VIEW.CLOSE_MESSAGES_BUTTON') }}
-        </div>
+        </span>
       </button>
     </div>
     <div class="unread-messages">
       <unread-message
-        v-for="(message, index) in allMessages"
+        v-for="(message, index) in messages"
         :key="message.id"
         :message-type="message.messageType"
         :message-id="message.id"
@@ -29,12 +25,12 @@
       <button
         v-if="unreadMessageCount"
         class="button clear-button"
-        @click="openFullView"
+        @click="openConversationView"
       >
-        <div class="flex items-center">
+        <span class="flex items-center">
           <fluent-icon class="mr-2" size="16" icon="arrow-right" />
           {{ $t('UNREAD_VIEW.VIEW_MESSAGES_BUTTON') }}
-        </div>
+        </span>
       </button>
     </div>
   </div>
@@ -44,7 +40,7 @@
 import { IFrameHelper } from 'widget/helpers/utils';
 import { mapGetters } from 'vuex';
 import configMixin from '../mixins/configMixin';
-
+import { ON_UNREAD_MESSAGE_CLICK } from '../constants/widgetBusEvents';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import UnreadMessage from 'widget/components/UnreadMessage.vue';
 
@@ -56,58 +52,25 @@ export default {
   },
   mixins: [configMixin],
   props: {
-    hasFetched: {
-      type: Boolean,
-      default: false,
-    },
-    unreadMessageCount: {
-      type: Number,
-      default: 0,
-    },
-    hideMessageBubble: {
-      type: Boolean,
-      default: false,
-    },
-    showUnreadView: {
-      type: Boolean,
-      default: false,
+    messages: {
+      type: Array,
+      required: true,
     },
   },
   computed: {
-    ...mapGetters({
-      unreadMessages: 'conversation/getUnreadTextMessages',
-      campaign: 'campaign/getActiveCampaign',
-    }),
-    showCloseButton() {
-      return this.unreadMessageCount;
-    },
+    ...mapGetters({ unreadMessageCount: 'conversation/getUnreadMessageCount' }),
     sender() {
-      const [firstMessage] = this.unreadMessages;
+      const [firstMessage] = this.messages;
       return firstMessage.sender || {};
     },
-    allMessages() {
-      if (this.showUnreadView) {
-        return this.unreadMessages;
-      }
-      const { sender, id: campaignId, message: content } = this.campaign;
-      return [
-        {
-          content,
-          sender,
-          campaignId,
-        },
-      ];
-    },
   },
   methods: {
-    openFullView() {
-      bus.$emit('on-unread-view-clicked');
+    openConversationView() {
+      bus.$emit(ON_UNREAD_MESSAGE_CLICK);
     },
     closeFullView() {
       if (IFrameHelper.isIFrame()) {
-        IFrameHelper.sendMessage({
-          event: 'toggleBubble',
-        });
+        IFrameHelper.sendMessage({ event: 'toggleBubble' });
       }
     },
     getMessageContent(message) {
diff --git a/app/javascript/widget/components/layouts/ViewWithHeader.vue b/app/javascript/widget/components/layouts/ViewWithHeader.vue
new file mode 100644
index 000000000..f4111eebf
--- /dev/null
+++ b/app/javascript/widget/components/layouts/ViewWithHeader.vue
@@ -0,0 +1,118 @@
+<template>
+  <div
+    class="w-full h-full bg-slate-50 flex flex-col"
+    @keydown.esc="closeWindow"
+  >
+    <div
+      class="header-wrap bg-white"
+      :class="{ expanded: !isHeaderCollapsed, collapsed: isHeaderCollapsed }"
+    >
+      <transition
+        enter-active-class="transition-all delay-200 duration-300 ease-in"
+        leave-active-class="transition-all duration-200 ease-out"
+        enter-class="opacity-0"
+        enter-to-class="opacity-100"
+        leave-class="opacity-100"
+        leave-to-class="opacity-0"
+      >
+        <chat-header-expanded
+          v-if="!isHeaderCollapsed"
+          :intro-heading="channelConfig.welcomeTitle"
+          :intro-body="channelConfig.welcomeTagline"
+          :avatar-url="channelConfig.avatarUrl"
+          :show-popout-button="appConfig.showPopoutButton"
+        />
+        <chat-header
+          v-if="isHeaderCollapsed"
+          :title="channelConfig.websiteName"
+          :avatar-url="channelConfig.avatarUrl"
+          :show-popout-button="appConfig.showPopoutButton"
+          :available-agents="availableAgents"
+        />
+      </transition>
+    </div>
+    <banner />
+    <transition
+      enter-active-class="transition-all delay-300 duration-300 ease-in"
+      leave-active-class="transition-all duration-200 ease-out"
+      enter-class="opacity-0"
+      enter-to-class="opacity-100"
+      leave-class="opacity-100"
+      leave-to-class="opacity-0"
+    >
+      <router-view />
+    </transition>
+    <branding />
+  </div>
+</template>
+<script>
+import Banner from '../Banner.vue';
+import Branding from 'shared/components/Branding.vue';
+import ChatHeader from '../ChatHeader.vue';
+import ChatHeaderExpanded from '../ChatHeaderExpanded.vue';
+import configMixin from '../../mixins/configMixin';
+import { mapGetters } from 'vuex';
+import { IFrameHelper } from 'widget/helpers/utils';
+
+export default {
+  components: {
+    Banner,
+    Branding,
+    ChatHeader,
+    ChatHeaderExpanded,
+  },
+  mixins: [configMixin],
+  data() {
+    return {
+      showPopoutButton: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      availableAgents: 'agent/availableAgents',
+      appConfig: 'appConfig/getAppConfig',
+    }),
+    isHeaderCollapsed() {
+      if (!this.hasIntroText) {
+        return true;
+      }
+      return this.$route.name !== 'home';
+    },
+    hasIntroText() {
+      return (
+        this.channelConfig.welcomeTitle || this.channelConfig.welcomeTagline
+      );
+    },
+  },
+  methods: {
+    closeWindow() {
+      IFrameHelper.sendMessage({ event: 'closeWindow' });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import '~widget/assets/scss/variables';
+@import '~widget/assets/scss/mixins';
+
+.header-wrap {
+  border-radius: $space-normal $space-normal 0 0;
+  flex-shrink: 0;
+  transition: max-height 300ms;
+  z-index: 99;
+  @include shadow-large;
+
+  &.expanded {
+    max-height: 16rem;
+  }
+
+  &.collapsed {
+    max-height: 4.5rem;
+  }
+
+  @media only screen and (min-device-width: 320px) and (max-device-width: 667px) {
+    border-radius: 0;
+  }
+}
+</style>
diff --git a/app/javascript/widget/constants/widgetBusEvents.js b/app/javascript/widget/constants/widgetBusEvents.js
new file mode 100644
index 000000000..769b941ee
--- /dev/null
+++ b/app/javascript/widget/constants/widgetBusEvents.js
@@ -0,0 +1,3 @@
+export const ON_AGENT_MESSAGE_RECEIVED = 'ON_AGENT_MESSAGE_RECEIVED';
+export const ON_UNREAD_MESSAGE_CLICK = 'ON_UNREAD_MESSAGE_CLICK';
+export const ON_CAMPAIGN_MESSAGE_CLICK = 'ON_CAMPAIGN_MESSAGE_CLICK';
diff --git a/app/javascript/widget/helpers/actionCable.js b/app/javascript/widget/helpers/actionCable.js
index 728e607b5..c5c262c1b 100644
--- a/app/javascript/widget/helpers/actionCable.js
+++ b/app/javascript/widget/helpers/actionCable.js
@@ -1,5 +1,6 @@
 import BaseActionCableConnector from '../../shared/helpers/BaseActionCableConnector';
 import { playNewMessageNotificationInWidget } from 'shared/helpers/AudioNotificationHelper';
+import { ON_AGENT_MESSAGE_RECEIVED } from '../constants/widgetBusEvents';
 
 class ActionCableConnector extends BaseActionCableConnector {
   constructor(app, pubsubToken) {
@@ -22,9 +23,7 @@ class ActionCableConnector extends BaseActionCableConnector {
   onMessageCreated = data => {
     this.app.$store
       .dispatch('conversation/addOrUpdateMessage', data)
-      .then(() => {
-        window.bus.$emit('on-agent-message-received');
-      });
+      .then(() => window.bus.$emit(ON_AGENT_MESSAGE_RECEIVED));
     if (data.sender_type === 'User') {
       playNewMessageNotificationInWidget();
     }
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index 046c87cc1..7718ea4d1 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -22,6 +22,7 @@
     "IN_A_DAY": "Typically replies in a day"
   },
   "START_CONVERSATION": "Start Conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
diff --git a/app/javascript/widget/mixins/configMixin.js b/app/javascript/widget/mixins/configMixin.js
index 53cc26a00..c91730767 100644
--- a/app/javascript/widget/mixins/configMixin.js
+++ b/app/javascript/widget/mixins/configMixin.js
@@ -25,10 +25,8 @@ export default {
       let requireEmail = false;
       let preChatMessage = '';
       const options = window.chatwootWebChannel.preChatFormOptions || {};
-      if (!this.isOnNewConversation) {
-        requireEmail = options.require_email;
-        preChatMessage = options.pre_chat_message;
-      }
+      requireEmail = options.require_email;
+      preChatMessage = options.pre_chat_message;
       return {
         requireEmail,
         preChatMessage,
diff --git a/app/javascript/widget/mixins/routerMixin.js b/app/javascript/widget/mixins/routerMixin.js
new file mode 100644
index 000000000..f75cc65e1
--- /dev/null
+++ b/app/javascript/widget/mixins/routerMixin.js
@@ -0,0 +1,10 @@
+export default {
+  methods: {
+    async replaceRoute(name) {
+      if (this.$route.name !== name) {
+        return this.$router.replace({ name });
+      }
+      return undefined;
+    },
+  },
+};
diff --git a/app/javascript/widget/router.js b/app/javascript/widget/router.js
index 36954b6ae..a07d37498 100755
--- a/app/javascript/widget/router.js
+++ b/app/javascript/widget/router.js
@@ -1,24 +1,42 @@
 import Vue from 'vue';
 import Router from 'vue-router';
-import Home from './views/Home.vue';
+import ViewWithHeader from './components/layouts/ViewWithHeader.vue';
 
 Vue.use(Router);
 
 export default new Router({
+  mode: 'hash',
   routes: [
     {
-      path: '/',
-      name: 'home',
-      component: Home,
+      path: '/unread-messages',
+      name: 'unread-messages',
+      component: () => import('./views/UnreadMessages.vue'),
+    },
+    {
+      path: '/campaigns',
+      name: 'campaigns',
+      component: () => import('./views/Campaigns.vue'),
+    },
+    {
+      path: '/',
+      component: ViewWithHeader,
+      children: [
+        {
+          path: '',
+          name: 'home',
+          component: () => import('./views/Home.vue'),
+        },
+        {
+          path: '/prechat-form',
+          name: 'prechat-form',
+          component: () => import('./views/PreChatForm.vue'),
+        },
+        {
+          path: '/messages',
+          name: 'messages',
+          component: () => import('./views/Messages.vue'),
+        },
+      ],
     },
-    // {
-    //   path: '/about',
-    //   name: 'about',
-    //   // route level code-splitting
-    //   // this generates a separate chunk (about.[hash].js) for this route
-    //   // which is lazy-loaded when the route is visited.
-    //   component: () =>
-    //     import(/* webpackChunkName: "about" */ './views/About.vue'),
-    // },
   ],
 });
diff --git a/app/javascript/widget/store/modules/appConfig.js b/app/javascript/widget/store/modules/appConfig.js
index e04f868b3..74c4bed6e 100644
--- a/app/javascript/widget/store/modules/appConfig.js
+++ b/app/javascript/widget/store/modules/appConfig.js
@@ -1,18 +1,43 @@
-import { SET_REFERRER_HOST, SET_WIDGET_COLOR } from '../types';
+import {
+  SET_REFERRER_HOST,
+  SET_WIDGET_APP_CONFIG,
+  SET_WIDGET_COLOR,
+  TOGGLE_WIDGET_OPEN,
+} from '../types';
 
 const state = {
+  showPopoutButton: false,
+  hideMessageBubble: false,
+  position: 'right',
+  isWebWidgetTriggered: false,
+  isCampaignViewClicked: false,
+  isWidgetOpen: false,
   widgetColor: '',
   referrerHost: '',
 };
 
 export const getters = {
+  getAppConfig: $state => $state,
+  isRightAligned: $state => $state.position === 'right',
+  getHideMessageBubble: $state => $state.hideMessageBubble,
+  getIsWidgetOpen: $state => $state.isWidgetOpen,
   getWidgetColor: $state => $state.widgetColor,
   getReferrerHost: $state => $state.referrerHost,
 };
 
 export const actions = {
-  setWidgetColor({ commit }, data) {
-    commit(SET_WIDGET_COLOR, data);
+  setAppConfig({ commit }, { showPopoutButton, position, hideMessageBubble }) {
+    commit(SET_WIDGET_APP_CONFIG, {
+      showPopoutButton: !!showPopoutButton,
+      position: position || 'right',
+      hideMessageBubble: !!hideMessageBubble,
+    });
+  },
+  toggleWidgetOpen({ commit }, isWidgetOpen) {
+    commit(TOGGLE_WIDGET_OPEN, isWidgetOpen);
+  },
+  setWidgetColor({ commit }, widgetColor) {
+    commit(SET_WIDGET_COLOR, widgetColor);
   },
   setReferrerHost({ commit }, referrerHost) {
     commit(SET_REFERRER_HOST, referrerHost);
@@ -20,8 +45,16 @@ export const actions = {
 };
 
 export const mutations = {
-  [SET_WIDGET_COLOR]($state, data) {
-    $state.widgetColor = data.widgetColor;
+  [SET_WIDGET_APP_CONFIG]($state, data) {
+    $state.showPopoutButton = data.showPopoutButton;
+    $state.position = data.position;
+    $state.hideMessageBubble = data.hideMessageBubble;
+  },
+  [TOGGLE_WIDGET_OPEN]($state, isWidgetOpen) {
+    $state.isWidgetOpen = isWidgetOpen;
+  },
+  [SET_WIDGET_COLOR]($state, widgetColor) {
+    $state.widgetColor = widgetColor;
   },
   [SET_REFERRER_HOST]($state, referrerHost) {
     $state.referrerHost = referrerHost;
diff --git a/app/javascript/widget/store/modules/campaign.js b/app/javascript/widget/store/modules/campaign.js
index 1f9a31150..673f52567 100644
--- a/app/javascript/widget/store/modules/campaign.js
+++ b/app/javascript/widget/store/modules/campaign.js
@@ -9,10 +9,8 @@ const state = {
   records: [],
   uiFlags: {
     isError: false,
-    hasFetched: false,
   },
   activeCampaign: {},
-  campaignHasExecuted: false,
 };
 
 const resetCampaignTimers = (
@@ -32,10 +30,8 @@ const resetCampaignTimers = (
 };
 
 export const getters = {
-  getHasFetched: $state => $state.uiFlags.hasFetched,
   getCampaigns: $state => $state.records,
   getActiveCampaign: $state => $state.activeCampaign,
-  getCampaignHasExecuted: $state => $state.campaignHasExecuted,
 };
 
 export const actions = {
@@ -47,7 +43,6 @@ export const actions = {
       const { data: campaigns } = await getCampaigns(websiteToken);
       commit('setCampaigns', campaigns);
       commit('setError', false);
-      commit('setHasFetched', true);
       resetCampaignTimers(
         campaigns,
         currentURL,
@@ -56,7 +51,6 @@ export const actions = {
       );
     } catch (error) {
       commit('setError', true);
-      commit('setHasFetched', true);
     }
   },
   initCampaigns: async (
@@ -82,13 +76,13 @@ export const actions = {
     {
       commit,
       rootState: {
-        events: { isOpen },
+        appConfig: { isWidgetOpen },
       },
     },
     { websiteToken, campaignId }
   ) => {
     // Disable campaign execution if widget is opened
-    if (!isOpen) {
+    if (!isWidgetOpen) {
       const { data: campaigns } = await getCampaigns(websiteToken);
       // Check campaign is disabled or not
       const campaign = campaigns.find(item => item.id === campaignId);
@@ -100,11 +94,21 @@ export const actions = {
 
   executeCampaign: async ({ commit }, { campaignId, websiteToken }) => {
     try {
+      commit(
+        'conversation/setConversationUIFlag',
+        { isCreating: true },
+        { root: true }
+      );
       await triggerCampaign({ campaignId, websiteToken });
-      commit('setCampaignExecuted');
       commit('setActiveCampaign', {});
     } catch (error) {
       commit('setError', true);
+    } finally {
+      commit(
+        'conversation/setConversationUIFlag',
+        { isCreating: false },
+        { root: true }
+      );
     }
   },
   resetCampaign: async ({ commit }) => {
@@ -126,12 +130,6 @@ export const mutations = {
   setError($state, value) {
     Vue.set($state.uiFlags, 'isError', value);
   },
-  setHasFetched($state, value) {
-    Vue.set($state.uiFlags, 'hasFetched', value);
-  },
-  setCampaignExecuted($state) {
-    Vue.set($state, 'campaignHasExecuted', true);
-  },
 };
 
 export default {
diff --git a/app/javascript/widget/store/modules/events.js b/app/javascript/widget/store/modules/events.js
index cadf0e18e..3fa38147d 100644
--- a/app/javascript/widget/store/modules/events.js
+++ b/app/javascript/widget/store/modules/events.js
@@ -1,9 +1,5 @@
 import events from 'widget/api/events';
 
-const state = {
-  isOpen: false,
-};
-
 const actions = {
   create: async (_, { name }) => {
     try {
@@ -14,16 +10,10 @@ const actions = {
   },
 };
 
-const mutations = {
-  toggleOpen($state) {
-    $state.isOpen = !$state.isOpen;
-  },
-};
-
 export default {
   namespaced: true,
-  state,
+  state: {},
   getters: {},
   actions,
-  mutations,
+  mutations: {},
 };
diff --git a/app/javascript/widget/store/modules/specs/agent/mutations.spec.js b/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
index 5d1ddaaa7..f29bb97d9 100644
--- a/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
@@ -18,7 +18,7 @@ describe('#mutations', () => {
     });
   });
 
-  describe('#setError', () => {
+  describe('#setHasFetched', () => {
     it('set fetched flag', () => {
       const state = { records: [], uiFlags: {} };
       mutations.setHasFetched(state, true);
diff --git a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
index cf1366226..7a5f47e87 100644
--- a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
@@ -13,10 +13,8 @@ describe('#actions', () => {
 
   describe('#setWidgetColor', () => {
     it('creates actions properly', () => {
-      actions.setWidgetColor({ commit }, { widgetColor: '#eaeaea' });
-      expect(commit.mock.calls).toEqual([
-        ['SET_WIDGET_COLOR', { widgetColor: '#eaeaea' }],
-      ]);
+      actions.setWidgetColor({ commit }, '#eaeaea');
+      expect(commit.mock.calls).toEqual([['SET_WIDGET_COLOR', '#eaeaea']]);
     });
   });
 });
diff --git a/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js b/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
index f8d90bf26..77a8cb096 100644
--- a/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
@@ -12,7 +12,7 @@ describe('#mutations', () => {
   describe('#SET_WIDGET_COLOR', () => {
     it('sets widget color properly', () => {
       const state = { widgetColor: '' };
-      mutations.SET_WIDGET_COLOR(state, { widgetColor: '#00bcd4' });
+      mutations.SET_WIDGET_COLOR(state, '#00bcd4');
       expect(state.widgetColor).toEqual('#00bcd4');
     });
   });
diff --git a/app/javascript/widget/store/modules/specs/campaign/actions.spec.js b/app/javascript/widget/store/modules/specs/campaign/actions.spec.js
index 49f441111..cdd3bf12c 100644
--- a/app/javascript/widget/store/modules/specs/campaign/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/campaign/actions.spec.js
@@ -24,7 +24,6 @@ describe('#actions', () => {
       expect(commit.mock.calls).toEqual([
         ['setCampaigns', campaigns],
         ['setError', false],
-        ['setHasFetched', true],
       ]);
       expect(campaignTimer.initTimers).toHaveBeenCalledWith(
         {
@@ -50,10 +49,7 @@ describe('#actions', () => {
           isInBusinessHours: true,
         }
       );
-      expect(commit.mock.calls).toEqual([
-        ['setError', true],
-        ['setHasFetched', true],
-      ]);
+      expect(commit.mock.calls).toEqual([['setError', true]]);
     });
   });
   describe('#initCampaigns', () => {
@@ -99,7 +95,7 @@ describe('#actions', () => {
           getters: { getCampaigns: campaigns },
           commit,
           rootState: {
-            events: { isOpen: true },
+            appConfig: { isWidgetOpen: true },
           },
         },
         { campaignId: 32 }
@@ -113,7 +109,7 @@ describe('#actions', () => {
           getters: { getCampaigns: campaigns },
           commit,
           rootState: {
-            events: { isOpen: false },
+            appConfig: { isWidgetOpen: false },
           },
         },
         { campaignId: 1 }
@@ -127,15 +123,52 @@ describe('#actions', () => {
       API.post.mockResolvedValue({});
       await actions.executeCampaign({ commit }, params);
       expect(commit.mock.calls).toEqual([
-        ['setCampaignExecuted'],
+        [
+          'conversation/setConversationUIFlag',
+          {
+            isCreating: true,
+          },
+          {
+            root: true,
+          },
+        ],
         ['setActiveCampaign', {}],
+        [
+          'conversation/setConversationUIFlag',
+          {
+            isCreating: false,
+          },
+          {
+            root: true,
+          },
+        ],
       ]);
     });
     it('sends correct actions if  execute campaign API is failed', async () => {
       const params = { campaignId: 12, websiteToken: 'XDsafmADasd' };
       API.post.mockRejectedValue({ message: 'Authentication required' });
       await actions.executeCampaign({ commit }, params);
-      expect(commit.mock.calls).toEqual([['setError', true]]);
+      expect(commit.mock.calls).toEqual([
+        [
+          'conversation/setConversationUIFlag',
+          {
+            isCreating: true,
+          },
+          {
+            root: true,
+          },
+        ],
+        ['setError', true],
+        [
+          'conversation/setConversationUIFlag',
+          {
+            isCreating: false,
+          },
+          {
+            root: true,
+          },
+        ],
+      ]);
     });
   });
 
diff --git a/app/javascript/widget/store/modules/specs/campaign/getters.spec.js b/app/javascript/widget/store/modules/specs/campaign/getters.spec.js
index ceb9185e2..2d027426c 100644
--- a/app/javascript/widget/store/modules/specs/campaign/getters.spec.js
+++ b/app/javascript/widget/store/modules/specs/campaign/getters.spec.js
@@ -129,17 +129,4 @@ describe('#getters', () => {
       updated_at: '2021-05-03T04:53:36.354Z',
     });
   });
-  it('getCampaignHasExecuted', () => {
-    const state = {
-      records: [],
-      uiFlags: {
-        isError: false,
-        hasFetched: false,
-      },
-      activeCampaign: {},
-      campaignHasExecuted: false,
-    };
-
-    expect(getters.getCampaignHasExecuted(state)).toEqual(false);
-  });
 });
diff --git a/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js b/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js
index 7a519028e..b35d0df15 100644
--- a/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/campaign/mutations.spec.js
@@ -18,14 +18,6 @@ describe('#mutations', () => {
     });
   });
 
-  describe('#setHasFetched', () => {
-    it('set fetched flag', () => {
-      const state = { records: [], uiFlags: {} };
-      mutations.setHasFetched(state, true);
-      expect(state.uiFlags.hasFetched).toEqual(true);
-    });
-  });
-
   describe('#setActiveCampaign', () => {
     it('set active campaign', () => {
       const state = { records: [] };
@@ -33,12 +25,4 @@ describe('#mutations', () => {
       expect(state.activeCampaign).toEqual(campaigns[0]);
     });
   });
-
-  describe('#setCampaignExecuted', () => {
-    it('set campaign executed flag', () => {
-      const state = { records: [], uiFlags: {}, campaignHasExecuted: false };
-      mutations.setCampaignExecuted(state);
-      expect(state.campaignHasExecuted).toEqual(true);
-    });
-  });
 });
diff --git a/app/javascript/widget/store/types.js b/app/javascript/widget/store/types.js
index a5ab12420..b7d2da402 100644
--- a/app/javascript/widget/store/types.js
+++ b/app/javascript/widget/store/types.js
@@ -1,6 +1,7 @@
-export const SET_WIDGET_COLOR = 'SET_WIDGET_COLOR';
-export const SET_REFERRER_HOST = 'SET_REFERRER_HOST';
-
-export const SET_CONVERSATION_ATTRIBUTES = 'SET_CONVERSATION_ATTRIBUTES';
-export const UPDATE_CONVERSATION_ATTRIBUTES = 'UPDATE_CONVERSATION_ATTRIBUTES';
 export const CLEAR_CONVERSATION_ATTRIBUTES = 'CLEAR_CONVERSATION_ATTRIBUTES';
+export const SET_CONVERSATION_ATTRIBUTES = 'SET_CONVERSATION_ATTRIBUTES';
+export const SET_WIDGET_APP_CONFIG = 'SET_WIDGET_APP_CONFIG';
+export const SET_WIDGET_COLOR = 'SET_WIDGET_COLOR';
+export const UPDATE_CONVERSATION_ATTRIBUTES = 'UPDATE_CONVERSATION_ATTRIBUTES';
+export const TOGGLE_WIDGET_OPEN = 'TOGGLE_WIDGET_OPEN';
+export const SET_REFERRER_HOST = 'SET_REFERRER_HOST';
diff --git a/app/javascript/widget/views/Campaigns.vue b/app/javascript/widget/views/Campaigns.vue
new file mode 100644
index 000000000..6bd28b7fa
--- /dev/null
+++ b/app/javascript/widget/views/Campaigns.vue
@@ -0,0 +1,28 @@
+<template>
+  <unread-message-list :messages="messages" />
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import UnreadMessageList from '../components/UnreadMessageList.vue';
+
+export default {
+  name: 'Campaigns',
+  components: {
+    UnreadMessageList,
+  },
+  computed: {
+    ...mapGetters({ campaign: 'campaign/getActiveCampaign' }),
+    messages() {
+      const { sender, id: campaignId, message: content } = this.campaign;
+      return [
+        {
+          content,
+          sender,
+          campaignId,
+        },
+      ];
+    },
+  },
+};
+</script>
diff --git a/app/javascript/widget/views/Home.vue b/app/javascript/widget/views/Home.vue
index 33deb60e1..32aae26f1 100755
--- a/app/javascript/widget/views/Home.vue
+++ b/app/javascript/widget/views/Home.vue
@@ -1,113 +1,33 @@
 <template>
-  <div
-    v-if="!conversationSize && isFetchingList"
-    class="flex flex-1 items-center h-full bg-black-25 justify-center"
-  >
-    <spinner size="" />
-  </div>
-  <div v-else class="home" @keydown.esc="closeChat">
-    <div
-      class="header-wrap bg-white"
-      :class="{ expanded: !isHeaderCollapsed, collapsed: isHeaderCollapsed }"
-    >
-      <transition
-        enter-active-class="transition-all delay-200 duration-300 ease"
-        leave-active-class="transition-all duration-200 ease-in"
-        enter-class="opacity-0 transform"
-        enter-to-class="opacity-100 transform"
-        leave-class="opacity-100 transform"
-        leave-to-class="opacity-0 transform"
-      >
-        <chat-header-expanded
-          v-if="!isHeaderCollapsed"
-          :intro-heading="channelConfig.welcomeTitle"
-          :intro-body="channelConfig.welcomeTagline"
-          :avatar-url="channelConfig.avatarUrl"
-          :show-popout-button="showPopoutButton"
-        />
-        <chat-header
-          v-if="isHeaderCollapsed"
-          :title="channelConfig.websiteName"
-          :avatar-url="channelConfig.avatarUrl"
-          :show-popout-button="showPopoutButton"
-          :available-agents="availableAgents"
-        />
-      </transition>
-    </div>
-    <banner />
+  <div class="flex flex-1 flex-col justify-end">
     <div class="flex flex-1 overflow-auto">
-      <conversation-wrap
-        v-if="currentView === 'messageView'"
-        :grouped-messages="groupedMessages"
-      />
-      <pre-chat-form
-        v-if="currentView === 'preChatFormView'"
-        :options="preChatFormOptions"
-      />
-    </div>
-    <div class="footer-wrap">
-      <transition
-        enter-active-class="transition-all delay-300 duration-300 ease"
-        leave-active-class="transition-all duration-200 ease-in"
-        enter-class="opacity-0 transform"
-        enter-to-class="opacity-100 transform translate-y-0"
-        leave-class="opacity-100 transform translate-y-0"
-        leave-to-class="opacity-0 transform "
-      >
-        <div v-if="currentView === 'messageView'" class="input-wrap">
-          <chat-footer />
-        </div>
-        <team-availability
-          v-if="currentView === 'cardView'"
-          :available-agents="availableAgents"
-          @start-conversation="startConversation"
-        />
-      </transition>
-      <branding></branding>
+      <!-- Load Converstion List Components Here -->
     </div>
+    <team-availability
+      :available-agents="availableAgents"
+      :has-conversation="!!conversationSize"
+      @start-conversation="startConversation"
+    />
   </div>
 </template>
 
 <script>
-import Branding from 'shared/components/Branding.vue';
-import ChatFooter from 'widget/components/ChatFooter.vue';
-import ChatHeaderExpanded from 'widget/components/ChatHeaderExpanded.vue';
-import ChatHeader from 'widget/components/ChatHeader.vue';
-import ConversationWrap from 'widget/components/ConversationWrap.vue';
-import { IFrameHelper } from 'widget/helpers/utils';
 import configMixin from '../mixins/configMixin';
 import TeamAvailability from 'widget/components/TeamAvailability';
-import Spinner from 'shared/components/Spinner.vue';
-import Banner from 'widget/components/Banner.vue';
 import { mapGetters } from 'vuex';
-import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
-import PreChatForm from '../components/PreChat/Form';
-import { isEmptyObject } from 'widget/helpers/utils';
-
+import routerMixin from 'widget/mixins/routerMixin';
 export default {
   name: 'Home',
   components: {
-    Branding,
-    ChatFooter,
-    ChatHeader,
-    ChatHeaderExpanded,
-    ConversationWrap,
-    PreChatForm,
-    Spinner,
     TeamAvailability,
-    Banner,
   },
-  mixins: [configMixin],
+  mixins: [configMixin, routerMixin],
   props: {
     hasFetched: {
       type: Boolean,
       default: false,
     },
-    showPopoutButton: {
-      type: Boolean,
-      default: false,
-    },
     isCampaignViewClicked: {
       type: Boolean,
       default: false,
@@ -122,57 +42,9 @@ export default {
   computed: {
     ...mapGetters({
       availableAgents: 'agent/availableAgents',
-      conversationAttributes: 'conversationAttributes/getConversationParams',
-      conversationSize: 'conversation/getConversationSize',
-      groupedMessages: 'conversation/getGroupedConversation',
-      isFetchingList: 'conversation/getIsFetchingList',
-      currentUser: 'contacts/getCurrentUser',
       activeCampaign: 'campaign/getActiveCampaign',
-      getCampaignHasExecuted: 'campaign/getCampaignHasExecuted',
+      conversationSize: 'conversation/getConversationSize',
     }),
-    currentView() {
-      const { email: currentUserEmail = '' } = this.currentUser;
-
-      if (this.isHeaderCollapsed) {
-        if (this.conversationSize) {
-          return 'messageView';
-        }
-
-        if (
-          !this.getCampaignHasExecuted &&
-          ((this.preChatFormEnabled &&
-            !isEmptyObject(this.activeCampaign) &&
-            this.preChatFormOptions.requireEmail) ||
-            this.isOnNewConversation ||
-            (this.preChatFormEnabled && !currentUserEmail))
-        ) {
-          return 'preChatFormView';
-        }
-        return 'messageView';
-      }
-      return 'cardView';
-    },
-    isOpen() {
-      return this.conversationAttributes.status === 'open';
-    },
-    fileUploadSizeLimit() {
-      return MAXIMUM_FILE_UPLOAD_SIZE;
-    },
-    isHeaderCollapsed() {
-      if (
-        !this.hasIntroText ||
-        this.conversationSize ||
-        this.isCampaignViewClicked
-      ) {
-        return true;
-      }
-      return this.isOnCollapsedView;
-    },
-    hasIntroText() {
-      return (
-        this.channelConfig.welcomeTitle || this.channelConfig.welcomeTagline
-      );
-    },
   },
   mounted() {
     bus.$on(BUS_EVENTS.START_NEW_CONVERSATION, () => {
@@ -182,73 +54,11 @@ export default {
   },
   methods: {
     startConversation() {
-      this.isOnCollapsedView = !this.isOnCollapsedView;
-    },
-    closeChat() {
-      IFrameHelper.sendMessage({ event: 'closeChat' });
+      if (this.preChatFormEnabled && !this.conversationSize) {
+        return this.replaceRoute('prechat-form');
+      }
+      return this.replaceRoute('messages');
     },
   },
 };
 </script>
-
-<style scoped lang="scss">
-@import '~widget/assets/scss/variables';
-@import '~widget/assets/scss/mixins';
-
-.home {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  flex-wrap: nowrap;
-  overflow: hidden;
-  background: $color-background;
-
-  .header-wrap {
-    border-radius: $space-normal $space-normal 0 0;
-    flex-shrink: 0;
-    transition: max-height 300ms;
-    z-index: 99;
-    @include shadow-large;
-
-    &.expanded {
-      max-height: 16rem;
-    }
-
-    &.collapsed {
-      max-height: 4.5rem;
-    }
-
-    @media only screen and (min-device-width: 320px) and (max-device-width: 667px) {
-      border-radius: 0;
-    }
-  }
-
-  .footer-wrap {
-    flex-shrink: 0;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    position: relative;
-
-    &:before {
-      content: '';
-      position: absolute;
-      top: -$space-normal;
-      left: 0;
-      width: 100%;
-      height: $space-normal;
-      opacity: 0.1;
-      background: linear-gradient(
-        to top,
-        $color-background,
-        rgba($color-background, 0)
-      );
-    }
-  }
-
-  .input-wrap {
-    padding: 0 $space-two;
-  }
-}
-</style>
diff --git a/app/javascript/widget/views/Messages.vue b/app/javascript/widget/views/Messages.vue
new file mode 100644
index 000000000..785a54316
--- /dev/null
+++ b/app/javascript/widget/views/Messages.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="flex flex-col flex-1 overflow-hidden">
+    <div class="flex flex-1 overflow-auto">
+      <conversation-wrap :grouped-messages="groupedMessages" />
+    </div>
+    <div class="px-5">
+      <chat-footer />
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import ChatFooter from '../components/ChatFooter.vue';
+import ConversationWrap from '../components/ConversationWrap.vue';
+
+export default {
+  components: { ChatFooter, ConversationWrap },
+  computed: {
+    ...mapGetters({
+      groupedMessages: 'conversation/getGroupedConversation',
+    }),
+  },
+  mounted() {
+    this.$store.dispatch('conversation/setUserLastSeen');
+  },
+};
+</script>
diff --git a/app/javascript/widget/views/PreChatForm.vue b/app/javascript/widget/views/PreChatForm.vue
new file mode 100644
index 000000000..ac70e4e56
--- /dev/null
+++ b/app/javascript/widget/views/PreChatForm.vue
@@ -0,0 +1,49 @@
+<template>
+  <div class="flex flex-1 overflow-auto">
+    <pre-chat-form :options="preChatFormOptions" @submit="onSubmit" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import PreChatForm from '../components/PreChat/Form';
+import configMixin from '../mixins/configMixin';
+import routerMixin from '../mixins/routerMixin';
+
+export default {
+  components: {
+    PreChatForm,
+  },
+  mixins: [configMixin, routerMixin],
+  computed: {
+    ...mapGetters({
+      conversationSize: 'conversation/getConversationSize',
+    }),
+  },
+  watch: {
+    conversationSize(newSize, oldSize) {
+      if (!oldSize && newSize > oldSize) {
+        this.replaceRoute('messages');
+      }
+    },
+  },
+  methods: {
+    onSubmit({ fullName, emailAddress, message, activeCampaignId }) {
+      if (activeCampaignId) {
+        bus.$emit('execute-campaign', activeCampaignId);
+        this.$store.dispatch('contacts/update', {
+          user: {
+            email: emailAddress,
+            name: fullName,
+          },
+        });
+      } else {
+        this.$store.dispatch('conversation/createConversation', {
+          fullName: fullName,
+          emailAddress: emailAddress,
+          message: message,
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/widget/views/Router.vue b/app/javascript/widget/views/Router.vue
deleted file mode 100644
index fb90cbd24..000000000
--- a/app/javascript/widget/views/Router.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <div
-    id="app"
-    class="woot-widget-wrap"
-    :class="{
-      'is-mobile': isMobile,
-      'is-widget-right': !isLeftAligned,
-      'is-bubble-hidden': hideMessageBubble,
-    }"
-  >
-    <home
-      v-if="showHomePage"
-      :has-fetched="hasFetched"
-      :unread-message-count="unreadMessageCount"
-      :show-popout-button="showPopoutButton"
-      :is-campaign-view-clicked="isCampaignViewClicked"
-    />
-    <unread
-      v-else
-      :show-unread-view="showUnreadView"
-      :has-fetched="hasFetched"
-      :unread-message-count="unreadMessageCount"
-      :hide-message-bubble="hideMessageBubble"
-    />
-  </div>
-</template>
-
-<script>
-import Home from './Home';
-import Unread from './Unread';
-
-export default {
-  name: 'Router',
-  components: {
-    Home,
-    Unread,
-  },
-  props: {
-    hasFetched: {
-      type: Boolean,
-      default: false,
-    },
-    isMobile: {
-      type: Boolean,
-      default: false,
-    },
-    isLeftAligned: {
-      type: Boolean,
-      default: false,
-    },
-    showUnreadView: {
-      type: Boolean,
-      default: false,
-    },
-    showCampaignView: {
-      type: Boolean,
-      default: false,
-    },
-    hideMessageBubble: {
-      type: Boolean,
-      default: false,
-    },
-    unreadMessageCount: {
-      type: Number,
-      default: 0,
-    },
-    showPopoutButton: {
-      type: Boolean,
-      default: false,
-    },
-    isCampaignViewClicked: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  computed: {
-    showHomePage() {
-      return !this.showUnreadView && !this.showCampaignView;
-    },
-  },
-};
-</script>
diff --git a/app/javascript/widget/views/UnreadMessages.vue b/app/javascript/widget/views/UnreadMessages.vue
new file mode 100644
index 000000000..d7e52a382
--- /dev/null
+++ b/app/javascript/widget/views/UnreadMessages.vue
@@ -0,0 +1,20 @@
+<template>
+  <unread-message-list :messages="messages" />
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import UnreadMessageList from '../components/UnreadMessageList.vue';
+
+export default {
+  name: 'UnreadMessages',
+  components: {
+    UnreadMessageList,
+  },
+  computed: {
+    ...mapGetters({
+      messages: 'conversation/getUnreadTextMessages',
+    }),
+  },
+};
+</script>

From 94209d29cb65223a2b3cadb3a25e0d522f6320c9 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 13 Jan 2022 01:57:16 +0530
Subject: [PATCH 002/101] fix: Fixes widget unread view blocking parent page
 (#3658)

Co-authored-by: Pranav <pranav@chatwoot.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/sdk/IFrameHelper.js            |  1 -
 app/javascript/sdk/sdk.js                     |  2 ++
 app/javascript/widget/App.vue                 | 22 +++++++++----------
 .../widget/helpers/IframeEventHelper.js       |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index e10feac6d..8dba6b13d 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -169,7 +169,6 @@ export const IFrameHelper = {
     },
     updateIframeHeight: message => {
       const { extraHeight = 0, isFixedHeight } = message;
-      if (!extraHeight) return;
 
       IFrameHelper.setFrameHeightToFitContent(extraHeight, isFixedHeight);
     },
diff --git a/app/javascript/sdk/sdk.js b/app/javascript/sdk/sdk.js
index 50f147c70..2e2aca7aa 100644
--- a/app/javascript/sdk/sdk.js
+++ b/app/javascript/sdk/sdk.js
@@ -18,6 +18,8 @@ export const SDK_CSS = `.woot-widget-holder {
 
 .woot-widget-holder.has-unread-view {
   border-radius: 0 !important;
+  min-height: 80px;
+  height: auto;
   bottom: 94px;
   box-shadow: none !important;
 }
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 6a4d4d7ec..7b047f7cc 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -166,7 +166,7 @@ export default {
         !isEmptyObject(activeCampaign) && !messageCount;
       if (this.isIFrame && isCampaignReadyToExecute) {
         this.replaceRoute('campaigns').then(() => {
-          this.setIframeHeight(this.isMobile);
+          this.setIframeHeight(true);
           IFrameHelper.sendMessage({ event: 'setUnreadMode' });
         });
       }
@@ -175,17 +175,16 @@ export default {
       const { unreadMessageCount } = this;
       if (this.isIFrame && unreadMessageCount > 0 && !this.isWidgetOpen) {
         this.replaceRoute('unread-messages').then(() => {
-          this.setIframeHeight(this.isMobile);
+          this.setIframeHeight(true);
           IFrameHelper.sendMessage({ event: 'setUnreadMode' });
         });
-        this.setIframeHeight(this.isMobile);
         this.handleUnreadNotificationDot();
       }
     },
     unsetUnreadView() {
       if (this.isIFrame) {
         IFrameHelper.sendMessage({ event: 'resetUnreadMode' });
-        this.setIframeHeight();
+        this.setIframeHeight(false);
         this.handleUnreadNotificationDot();
       }
     },
@@ -260,17 +259,18 @@ export default {
         } else if (message.event === 'toggle-open') {
           this.$store.dispatch('appConfig/toggleWidgetOpen', message.isOpen);
 
-          if (
+          const shouldShowMessageView =
             ['home'].includes(this.$route.name) &&
             message.isOpen &&
-            this.messageCount
-          ) {
+            this.messageCount;
+          const shouldShowHomeView =
+            !message.isOpen &&
+            ['unread-messages', 'campaigns'].includes(this.$route.name);
+
+          if (shouldShowMessageView) {
             this.replaceRoute('messages');
           }
-          if (
-            !message.isOpen &&
-            ['unread-messages', 'campaigns'].includes(this.$route.name)
-          ) {
+          if (shouldShowHomeView) {
             this.$store.dispatch('conversation/setUserLastSeen');
             this.unsetUnreadView();
             this.replaceRoute('home');
diff --git a/app/javascript/widget/helpers/IframeEventHelper.js b/app/javascript/widget/helpers/IframeEventHelper.js
index f09cb0f47..953802df8 100644
--- a/app/javascript/widget/helpers/IframeEventHelper.js
+++ b/app/javascript/widget/helpers/IframeEventHelper.js
@@ -19,7 +19,7 @@ export const getExtraSpaceToScroll = () => {
   if (!unreadMessageWrap) return 0;
 
   // 24px to compensate the paddings
-  let extraHeight = 24 + unreadMessageWrap.scrollHeight;
+  let extraHeight = 48 + unreadMessageWrap.scrollHeight;
   if (unreadCloseWrap) extraHeight += unreadCloseWrap.scrollHeight;
   if (readViewWrap) extraHeight += readViewWrap.scrollHeight;
 

From 1c99294c8c52f3780ff73c7a6ffa892d2ce2b4a7 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 12 Jan 2022 17:41:42 -0800
Subject: [PATCH 003/101] chore: Fix 360Dialog template message breakage
 (#3750)

Template parsing fails when regexp characters are present in templates.

Fixes: #3587
---
 .../whatsapp/send_on_whatsapp_service.rb      | 11 ++++-
 spec/factories/channel/channel_whatsapp.rb    |  9 ++++
 .../whatsapp/send_on_whatsapp_service_spec.rb | 41 +++++++++++++++----
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/app/services/whatsapp/send_on_whatsapp_service.rb b/app/services/whatsapp/send_on_whatsapp_service.rb
index 4fbaa1312..2cc96f041 100644
--- a/app/services/whatsapp/send_on_whatsapp_service.rb
+++ b/app/services/whatsapp/send_on_whatsapp_service.rb
@@ -56,7 +56,16 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
   def build_template_match_regex(template_text)
     # Converts the whatsapp template to a comparable regex string to check against the message content
     # the variables are of the format {{num}} ex:{{1}}
-    template_match_string = "^#{template_text.gsub(/{{\d}}/, '(.*)')}$"
+
+    # transform the template text into a regex string
+    # we need to replace the {{num}} with matchers that can be used to capture the variables
+    template_text = template_text.gsub(/{{\d}}/, '(.*)')
+    # escape if there are regex characters in the template text
+    template_text = Regexp.escape(template_text)
+    # ensuring only the variables remain as capture groups
+    template_text = template_text.gsub(Regexp.escape('(.*)'), '(.*)')
+
+    template_match_string = "^#{template_text}$"
     Regexp.new template_match_string
   end
 
diff --git a/spec/factories/channel/channel_whatsapp.rb b/spec/factories/channel/channel_whatsapp.rb
index 87ded15ab..0c60cc78f 100644
--- a/spec/factories/channel/channel_whatsapp.rb
+++ b/spec/factories/channel/channel_whatsapp.rb
@@ -13,6 +13,15 @@ FactoryBot.define do
                             [{ 'text' => 'Paket Anda sudah dikirim. Paket akan sampai dalam {{1}} hari kerja.', 'type' => 'BODY' },
                              { 'text' => 'Pesan ini berasal dari bisnis yang tidak terverifikasi.', 'type' => 'FOOTER' }],
          'rejected_reason' => 'NONE' },
+       { 'name' => 'customer_yes_no',
+         'status' => 'approved',
+         'category' => 'SHIPPING_UPDATE',
+         'language' => 'ar',
+         'namespace' => '2342384942_32423423_23423fdsdaf23',
+         'components' =>
+                            [{ 'text' => 'عميلنا العزيز الرجاء الرد على هذه الرسالة بكلمة *نعم* للرد على إستفساركم من قبل خدمة العملاء.',
+                               'type' => 'BODY' }],
+         'rejected_reason' => 'NONE' },
        { 'name' => 'sample_shipping_confirmation',
          'status' => 'approved',
          'category' => 'SHIPPING_UPDATE',
diff --git a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
index 0dc8f6809..29c583031 100644
--- a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
+++ b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
@@ -7,11 +7,12 @@ describe Whatsapp::SendOnWhatsappService do
     end
 
     context 'when a valid message' do
+      let(:whatsapp_request) { double }
+      let!(:whatsapp_channel) { create(:channel_whatsapp) }
+      let!(:contact_inbox) { create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: '123456789') }
+      let!(:conversation) { create(:conversation, contact_inbox: contact_inbox, inbox: whatsapp_channel.inbox) }
+
       it 'calls channel.send_message when with in 24 hour limit' do
-        whatsapp_request = double
-        whatsapp_channel = create(:channel_whatsapp)
-        contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: '123456789')
-        conversation = create(:conversation, contact_inbox: contact_inbox, inbox: whatsapp_channel.inbox)
         # to handle the case of 24 hour window limit.
         create(:message, message_type: :incoming, content: 'test',
                          conversation: conversation)
@@ -30,10 +31,6 @@ describe Whatsapp::SendOnWhatsappService do
       end
 
       it 'calls channel.send_template when after 24 hour limit' do
-        whatsapp_request = double
-        whatsapp_channel = create(:channel_whatsapp)
-        contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: '123456789')
-        conversation = create(:conversation, contact_inbox: contact_inbox, inbox: whatsapp_channel.inbox)
         message = create(:message, message_type: :outgoing, content: 'Your package has been shipped. It will be delivered in 3 business days.',
                                    conversation: conversation)
         allow(HTTParty).to receive(:post).and_return(whatsapp_request)
@@ -56,6 +53,34 @@ describe Whatsapp::SendOnWhatsappService do
         described_class.new(message: message).perform
         expect(message.reload.source_id).to eq('123456789')
       end
+
+      it 'calls channel.send_template when template has regexp characters' do
+        message = create(
+          :message,
+          message_type: :outgoing,
+          content: 'عميلنا العزيز الرجاء الرد على هذه الرسالة بكلمة *نعم* للرد على إستفساركم من قبل خدمة العملاء.',
+          conversation: conversation
+        )
+        allow(HTTParty).to receive(:post).and_return(whatsapp_request)
+        allow(whatsapp_request).to receive(:success?).and_return(true)
+        allow(whatsapp_request).to receive(:[]).with('messages').and_return([{ 'id' => '123456789' }])
+        expect(HTTParty).to receive(:post).with(
+          'https://waba.360dialog.io/v1/messages',
+          headers: { 'D360-API-KEY' => 'test_key', 'Content-Type' => 'application/json' },
+          body: {
+            to: '123456789',
+            template: {
+              name: 'customer_yes_no',
+              namespace: '2342384942_32423423_23423fdsdaf23',
+              language: { 'policy': 'deterministic', 'code': 'ar' },
+              components: [{ 'type': 'body', 'parameters': [] }]
+            },
+            type: 'template'
+          }.to_json
+        )
+        described_class.new(message: message).perform
+        expect(message.reload.source_id).to eq('123456789')
+      end
     end
   end
 end

From 905fd62974b967987db5c8066a0747db76991b7e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 12 Jan 2022 19:42:23 -0800
Subject: [PATCH 004/101] chore: Support Whatsapp Interactive messages
 (360Dialog) (#3751)

Render button and list reply clicks as text messages in agent dashboard

fixes: #3684
---
 .../whatsapp/incoming_message_service.rb      | 11 ++++++++--
 .../whatsapp/incoming_message_service_spec.rb | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/services/whatsapp/incoming_message_service.rb b/app/services/whatsapp/incoming_message_service.rb
index 4169d4fb2..a10d40797 100644
--- a/app/services/whatsapp/incoming_message_service.rb
+++ b/app/services/whatsapp/incoming_message_service.rb
@@ -13,7 +13,7 @@ class Whatsapp::IncomingMessageService
     return if params[:messages].blank?
 
     @message = @conversation.messages.build(
-      content: params[:messages].first.dig(:text, :body),
+      content: message_content(params[:messages].first),
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
       message_type: :incoming,
@@ -26,6 +26,13 @@ class Whatsapp::IncomingMessageService
 
   private
 
+  def message_content(message)
+    # TODO: map interactive messages back to button messages in chatwoot
+    message.dig(:text, :body) ||
+      message.dig(:interactive, :button_reply, :title) ||
+      message.dig(:interactive, :list_reply, :title)
+  end
+
   def account
     @account ||= inbox.account
   end
@@ -70,7 +77,7 @@ class Whatsapp::IncomingMessageService
 
   def attach_files
     message_type = params[:messages].first[:type]
-    return if message_type == 'text'
+    return if %w[text interactive].include?(message_type)
 
     attachment_payload = params[:messages].first[message_type.to_sym]
     attachment_file = Down.download(inbox.channel.media_url(attachment_payload[:id]), headers: inbox.channel.api_headers)
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index cc000e5af..2c2b587b3 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -22,6 +22,27 @@ describe Whatsapp::IncomingMessageService do
       end
     end
 
+    context 'when valid interactive message params' do
+      it 'creates appropriate conversations, message and contacts' do
+        params = {
+          'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
+          'messages' => [{ 'from' => '2423423243', 'id' => 'SDFADSf23sfasdafasdfa',
+                           'interactive': {
+                             'button_reply': {
+                               'id': '1',
+                               'title': 'First Button'
+                             },
+                             'type': 'button_reply'
+                           },
+                           'timestamp' => '1633034394', 'type' => 'interactive' }]
+        }.with_indifferent_access
+        described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
+        expect(whatsapp_channel.inbox.conversations.count).not_to eq(0)
+        expect(Contact.all.first.name).to eq('Sojan Jose')
+        expect(whatsapp_channel.inbox.messages.first.content).to eq('First Button')
+      end
+    end
+
     context 'when valid attachment message params' do
       it 'creates appropriate conversations, message and contacts' do
         stub_request(:get, whatsapp_channel.media_url('b1c68f38-8734-4ad3-b4a1-ef0c10d683')).to_return(

From 7df68c6388046f94a5c886f0707abd4ef16be6af Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 13 Jan 2022 11:21:06 +0530
Subject: [PATCH 005/101] Feat: Automations Actions (#3564)

---
 .../accounts/automation_rules_controller.rb   |  2 +-
 app/listeners/automation_rule_listener.rb     | 17 ++++++-
 app/models/automation_rule.rb                 |  3 ++
 .../automation_rules/action_service.rb        |  2 +
 .../conditions_filter_service.rb              | 23 +++++++++
 app/services/filter_service.rb                |  5 +-
 .../automation_rules/index.json.jbuilder      |  2 +-
 .../partials/_automation_rule.json.jbuilder   |  2 +
 ...0126_add_active_flag_to_automation_rule.rb |  5 ++
 db/schema.rb                                  |  1 +
 lib/filters/filter_keys.json                  | 16 ++++++
 .../automation_rules_controller_spec.rb       |  2 +-
 .../automation_rule_listener_spec.rb          | 51 ++++++++++++++++++-
 13 files changed, 124 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20220110090126_add_active_flag_to_automation_rule.rb

diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index 0ec35c765..723e587e6 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
   before_action :check_authorization
 
   def index
-    @automation_rules = Current.account.automation_rules
+    @automation_rules = Current.account.automation_rules.active
   end
 
   def create
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 9562e4ffe..7b64a0b3a 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -14,12 +14,25 @@ class AutomationRuleListener < BaseListener
     return unless rule_present?('conversation_created', conversation)
 
     @rules.each do |rule|
-      conditions_match = AutomationRule::ConditionsFilterService.new(rule, conversation).perform
-      AutomationRule::ActionService.new(rule, conversation).perform if conditions_match.present?
+      conditions_match = ::AutomationRule::ConditionsFilterService.new(rule, conversation).perform
+      ::AutomationRules::ActionService.new(rule, conversation).perform if conditions_match.present?
+    end
+  end
+
+  def message_created(event_obj)
+    conversation = event_obj.data[:conversation]
+    message = event_obj.data[:message]
+    return unless rule_present?('message_created', conversation)
+
+    @rules.each do |rule|
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation).message_conditions(message)
+      ::AutomationRules::ActionService.new(rule, conversation).perform if conditions_match.present?
     end
   end
 
   def rule_present?(event_name, conversation)
+    return if conversation.blank?
+
     @rules = AutomationRule.where(
       event_name: event_name,
       account_id: conversation.account_id
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 84ae6b51c..4f9717481 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -4,6 +4,7 @@
 #
 #  id          :bigint           not null, primary key
 #  actions     :jsonb            not null
+#  active      :boolean          default(TRUE), not null
 #  conditions  :jsonb            not null
 #  description :text
 #  event_name  :string           not null
@@ -23,6 +24,8 @@ class AutomationRule < ApplicationRecord
   validate :json_conditions_format
   validate :json_actions_format
 
+  scope :active, -> { where(active: true) }
+
   CONDITIONS_ATTRS = %w[country_code status browser_language assignee_id team_id referer].freeze
   ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agents].freeze
 
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 28327959a..94dc7ab28 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -46,6 +46,8 @@ class AutomationRules::ActionService
       TeamNotifications::AutomationNotificationMailer.conversation_creation(@conversation, team, params[:message])
     when 'conversation_updated'
       TeamNotifications::AutomationNotificationMailer.conversation_updated(@conversation, team, params[:message])
+    when 'message_created'
+      TeamNotifications::AutomationNotificationMailer.message_created(@conversation, team, params[:message])
     end
   end
 
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index bce3b581d..6e3d7f64f 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -21,6 +21,29 @@ class AutomationRules::ConditionsFilterService < FilterService
     records.any?
   end
 
+  def message_conditions(_message)
+    message_filters = @filters['messages']
+
+    @rule.conditions.each_with_index do |query_hash, current_index|
+      current_filter = message_filters[query_hash['attribute_key']]
+      @query_string += message_query_string(current_filter, query_hash.with_indifferent_access, current_index)
+    end
+    records = Message.where(conversation: @conversation).where(@query_string, @filter_values.with_indifferent_access)
+    records.any?
+  end
+
+  def message_query_string(current_filter, query_hash, current_index)
+    attribute_key = query_hash['attribute_key']
+    query_operator = query_hash['query_operator']
+
+    filter_operator_value = filter_operation(query_hash, current_index)
+
+    case current_filter['attribute_type']
+    when 'standard'
+      " messages.#{attribute_key} #{filter_operator_value} #{query_operator} "
+    end
+  end
+
   def conversation_query_string(current_filter, query_hash, current_index)
     attribute_key = query_hash['attribute_key']
     query_operator = query_hash['query_operator']
diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb
index 263a6bfeb..054060742 100644
--- a/app/services/filter_service.rb
+++ b/app/services/filter_service.rb
@@ -31,10 +31,13 @@ class FilterService
   end
 
   def filter_values(query_hash)
-    if query_hash['attribute_key'] == 'status'
+    case query_hash['attribute_key']
+    when 'status'
       return Conversation.statuses.values if query_hash['values'].include?('all')
 
       query_hash['values'].map { |x| Conversation.statuses[x.to_sym] }
+    when 'message_type'
+      query_hash['values'].map { |x| Message.message_types[x.to_sym] }
     else
       query_hash['values']
     end
diff --git a/app/views/api/v1/accounts/automation_rules/index.json.jbuilder b/app/views/api/v1/accounts/automation_rules/index.json.jbuilder
index 266ab14b8..e4a363086 100644
--- a/app/views/api/v1/accounts/automation_rules/index.json.jbuilder
+++ b/app/views/api/v1/accounts/automation_rules/index.json.jbuilder
@@ -1,4 +1,4 @@
-json.data do
+json.payload do
   json.array! @automation_rules do |automation_rule|
     json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: automation_rule
   end
diff --git a/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder b/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
index 9799a4339..e8e596659 100644
--- a/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
+++ b/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
@@ -5,3 +5,5 @@ json.description automation_rule.description
 json.event_name automation_rule.event_name
 json.conditions automation_rule.conditions
 json.actions automation_rule.actions
+json.created_on automation_rule.created_at
+json.active automation_rule.active?
diff --git a/db/migrate/20220110090126_add_active_flag_to_automation_rule.rb b/db/migrate/20220110090126_add_active_flag_to_automation_rule.rb
new file mode 100644
index 000000000..cd1d73270
--- /dev/null
+++ b/db/migrate/20220110090126_add_active_flag_to_automation_rule.rb
@@ -0,0 +1,5 @@
+class AddActiveFlagToAutomationRule < ActiveRecord::Migration[6.1]
+  def change
+    add_column :automation_rules, :active, :boolean, default: true, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 53d72fe98..de8245d92 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -133,6 +133,7 @@ ActiveRecord::Schema.define(version: 2022_01_11_223630) do
     t.jsonb "actions", default: "{}", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.boolean "active", default: true, null: false
     t.index ["account_id"], name: "index_automation_rules_on_account_id"
   end
 
diff --git a/lib/filters/filter_keys.json b/lib/filters/filter_keys.json
index 9412980a7..a34dad067 100644
--- a/lib/filters/filter_keys.json
+++ b/lib/filters/filter_keys.json
@@ -135,5 +135,21 @@
       "filter_operators": ["exactly_equal_to", "contains", "does_not_contain" ],
       "attribute_type": "standard"
     }
+  },
+  "messages": {
+    "message_type": {
+      "attribute_name": "Message Type",
+      "input_type": "search_box with name tags/plain text",
+      "data_type": "text",
+      "filter_operators": [ "equal_to", "not_equal_to" ],
+      "attribute_type": "standard"
+    },
+    "content": {
+      "attribute_name": "Message Type",
+      "input_type": "search_box with name tags/plain text",
+      "data_type": "text",
+      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
+      "attribute_type": "standard"  
+    }
   }
 }
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index d922c7f06..dda022839 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
 
         expect(response).to have_http_status(:success)
         body = JSON.parse(response.body, symbolize_names: true)
-        expect(body[:data].first[:id]).to eq(automation_rule.id)
+        expect(body[:payload].first[:id]).to eq(automation_rule.id)
       end
     end
 
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index f14167f5f..8a5e2f8d3 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 describe AutomationRuleListener do
   let(:listener) { described_class.instance }
-  let(:account) { create(:account) }
+  let!(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account) }
   let(:contact) { create(:contact, account: account, identifier: '123') }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
@@ -69,4 +69,53 @@ describe AutomationRuleListener do
       end
     end
   end
+
+  describe '#message_created' do
+    before do
+      automation_rule.update!(
+        event_name: 'message_created',
+        name: 'Call actions message created',
+        description: 'Add labels, assign team after message created',
+        conditions: [{ 'values': ['incoming'], 'attribute_key': 'message_type', 'query_operator': nil, 'filter_operator': 'equal_to' }]
+      )
+    end
+
+    let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'incoming') }
+    let!(:event) do
+      Events::Base.new('message_created', Time.zone.now, { conversation: conversation, message: message })
+    end
+
+    context 'when rule matches' do
+      it 'triggers automation rule to assign team' do
+        expect(conversation.team_id).not_to eq(team.id)
+
+        automation_rule
+        listener.message_created(event)
+
+        conversation.reload
+        expect(conversation.team_id).to eq(team.id)
+      end
+
+      it 'triggers automation rule to add label' do
+        expect(conversation.labels).to eq([])
+
+        automation_rule
+        listener.message_created(event)
+
+        conversation.reload
+        expect(conversation.labels.pluck(:name)).to eq(%w[support priority_customer])
+      end
+
+      it 'triggers automation rule to assign best agents' do
+        expect(conversation.assignee).to be_nil
+
+        automation_rule
+        listener.message_created(event)
+
+        conversation.reload
+
+        expect(conversation.assignee).to eq(user_1)
+      end
+    end
+  end
 end

From 5046dcaf61b937a6c04a00f641219b978145957e Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 13 Jan 2022 10:52:48 -0800
Subject: [PATCH 006/101] fix: Update broken CSS Styles in liquid template
 (#3756)

---
 .../conversation_assignment.liquid                              | 2 +-
 .../conversation_creation.liquid                                | 2 +-
 .../conversation_reply_mailer/reply_with_summary.html.erb       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
index e138fd11a..18cd21e75 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
@@ -12,7 +12,7 @@
   </div>
 
   <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: "Helvetica Neue",Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
       {% if chat_message.content %}
         {{chat_message.content}}
       {% endif %}
diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
index 095e1bd7b..d7dac7cca 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
@@ -15,7 +15,7 @@
   </div>
 
   <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: "Helvetica Neue",Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
       {% if chat_message.content %}
         {{chat_message.content}}
       {% endif %}
diff --git a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
index b160675a3..34665b777 100644
--- a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
@@ -9,7 +9,7 @@
     </td>
   </tr>
   <tr>
-    <td style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: "Helvetica Neue",Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    <td style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
       <% if message.content %>
         <%= CommonMarker.render_html(message.content).html_safe %>
       <% end %>

From d57be3ffae7bbd0cc3ac19f2c6499358aa79b21f Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 14 Jan 2022 00:24:00 +0530
Subject: [PATCH 007/101] fix: Allow private note without selecting a tweet
 (#3754)

---
 .../dashboard/components/widgets/conversation/ReplyBox.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index f474e3e76..83c209f8e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -189,7 +189,7 @@ export default {
       return this.maxLength - this.message.length;
     },
     isReplyButtonDisabled() {
-      if (this.isATweet && !this.inReplyTo) {
+      if (this.isATweet && !this.inReplyTo && !this.isOnPrivateNote) {
         return true;
       }
 

From 7fcac532dfd581fa2f3d791f41fd1fc1d6cb4e90 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 14 Jan 2022 00:24:52 +0530
Subject: [PATCH 008/101] fix: Update timestamp style on the private message
 from bot (#3758)

---
 .../dashboard/components/widgets/conversation/Message.vue      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 3e34a456f..a79d4150f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -423,6 +423,9 @@ export default {
       .message-text--metadata .time {
         color: var(--v-50);
       }
+      &.is-private .message-text--metadata .time {
+        color: var(--s-400);
+      }
     }
 
     &.is-failed {

From 359caf754c4c6ccbfce0de5285e875cbf0f14b58 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 14 Jan 2022 00:27:12 +0530
Subject: [PATCH 009/101] fix: Update contact bio style to solve overflow
 (#3753)

---
 .../routes/dashboard/conversation/contact/ContactInfo.vue      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index d2cf8974a..4d2d98413 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -340,6 +340,9 @@ export default {
 .merege-summary--card {
   padding: var(--space-normal);
 }
+.contact--bio {
+  word-wrap: break-word;
+}
 
 .button--contact-menu {
   position: absolute;

From cab5a3e53b9b216bca2ab2680bfe802e1e28ab91 Mon Sep 17 00:00:00 2001
From: Ximena Sandoval <ximena.sandoval.dh@gmail.com>
Date: Thu, 13 Jan 2022 12:15:40 -0700
Subject: [PATCH 010/101] chore: Add a redirect link to the conversation in
 success toast message (#3711)

When creating a conversation from the contacts tab now we can go directly to the conversation by clicking the link in the success message

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/assets/scss/widgets/_snackbar.scss    |  2 +-
 app/javascript/dashboard/components/Snackbar.vue    |  9 +++++++++
 .../dashboard/components/SnackbarContainer.vue      |  9 +++++++--
 .../widgets/conversation/specs/MoreActions.spec.js  |  6 ++++--
 .../dashboard/i18n/locale/en/contact.json           |  1 +
 .../conversation/contact/ConversationForm.vue       | 13 ++++++++++---
 .../conversation/contact/NewConversation.vue        |  6 +++++-
 .../dashboard/store/modules/contactConversations.js |  1 +
 app/javascript/shared/mixins/alertMixin.js          |  4 ++--
 9 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss b/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
index b714b051d..5f60d827c 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
@@ -15,7 +15,7 @@
   @include shadow;
   background-color: $woot-snackbar-bg;
   border-radius: $space-smaller;
-  display: inline-block;
+  display: inline-flex;
   margin-bottom: $space-small;
   max-width: 40rem;
   min-height: 3rem;
diff --git a/app/javascript/dashboard/components/Snackbar.vue b/app/javascript/dashboard/components/Snackbar.vue
index ecfebe5e0..ef475e7db 100644
--- a/app/javascript/dashboard/components/Snackbar.vue
+++ b/app/javascript/dashboard/components/Snackbar.vue
@@ -4,6 +4,11 @@
       <div class="ui-snackbar-text">
         {{ message }}
       </div>
+      <div v-if="action" class="ui-snackbar-action">
+        <router-link v-if="action.type == 'link'" :to="action.to">
+          {{ action.message }}
+        </router-link>
+      </div>
     </div>
   </div>
 </template>
@@ -12,6 +17,10 @@
 export default {
   props: {
     message: { type: String, default: '' },
+    action: {
+      type: Object,
+      default: () => {},
+    },
     showButton: Boolean,
     duration: {
       type: [String, Number],
diff --git a/app/javascript/dashboard/components/SnackbarContainer.vue b/app/javascript/dashboard/components/SnackbarContainer.vue
index 3ab3d67fc..d0d57370a 100644
--- a/app/javascript/dashboard/components/SnackbarContainer.vue
+++ b/app/javascript/dashboard/components/SnackbarContainer.vue
@@ -4,6 +4,7 @@
       v-for="snackMessage in snackMessages"
       :key="snackMessage.key"
       :message="snackMessage.message"
+      :action="snackMessage.action"
     />
   </transition-group>
 </template>
@@ -35,8 +36,12 @@ export default {
     bus.$off('newToastMessage', this.onNewToastMessage);
   },
   methods: {
-    onNewToastMessage(message) {
-      this.snackMessages.push({ key: new Date().getTime(), message });
+    onNewToastMessage(message, action) {
+      this.snackMessages.push({
+        key: new Date().getTime(),
+        message,
+        action,
+      });
       window.setTimeout(() => {
         this.snackMessages.splice(0, 1);
       }, this.duration);
diff --git a/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js b/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js
index 639dc239a..9bf61c59c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js
+++ b/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js
@@ -84,7 +84,8 @@ describe('MoveActions', () => {
 
       expect(window.bus.$emit).toBeCalledWith(
         'newToastMessage',
-        'This conversation is muted for 6 hours'
+        'This conversation is muted for 6 hours',
+        undefined
       );
     });
   });
@@ -109,7 +110,8 @@ describe('MoveActions', () => {
 
       expect(window.bus.$emit).toBeCalledWith(
         'newToastMessage',
-        'This conversation is unmuted'
+        'This conversation is unmuted',
+        undefined
       );
     });
   });
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index baa7c8d7d..976f4c53e 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Cancel",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "View",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index b0251df18..923e6d408 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -174,7 +174,6 @@ export default {
     onSuccess() {
       this.$emit('success');
     },
-
     async handleSubmit() {
       this.$v.$touch();
       if (this.$v.$invalid) {
@@ -182,9 +181,17 @@ export default {
       }
       try {
         const payload = this.getNewConversation;
-        await this.onSubmit(payload);
+        const data = await this.onSubmit(payload);
+        const action = {
+          type: 'link',
+          to: `/app/accounts/${data.account_id}/conversations/${data.id}`,
+          message: this.$t('NEW_CONVERSATION.FORM.GO_TO_CONVERSATION'),
+        };
         this.onSuccess();
-        this.showAlert(this.$t('NEW_CONVERSATION.FORM.SUCCESS_MESSAGE'));
+        this.showAlert(
+          this.$t('NEW_CONVERSATION.FORM.SUCCESS_MESSAGE'),
+          action
+        );
       } catch (error) {
         if (error instanceof ExceptionWithMessage) {
           this.showAlert(error.data);
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/NewConversation.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/NewConversation.vue
index c0d342d7a..f8c3b23a3 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/NewConversation.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/NewConversation.vue
@@ -49,7 +49,11 @@ export default {
       this.$emit('cancel');
     },
     async onSubmit(contactItem) {
-      await this.$store.dispatch('contactConversations/create', contactItem);
+      const data = await this.$store.dispatch(
+        'contactConversations/create',
+        contactItem
+      );
+      return data;
     },
   },
 };
diff --git a/app/javascript/dashboard/store/modules/contactConversations.js b/app/javascript/dashboard/store/modules/contactConversations.js
index 3c3280721..49eeabdc4 100644
--- a/app/javascript/dashboard/store/modules/contactConversations.js
+++ b/app/javascript/dashboard/store/modules/contactConversations.js
@@ -39,6 +39,7 @@ export const actions = {
         id: contactId,
         data,
       });
+      return data;
     } catch (error) {
       throw new Error(error);
     } finally {
diff --git a/app/javascript/shared/mixins/alertMixin.js b/app/javascript/shared/mixins/alertMixin.js
index ba0064f44..50ace13f1 100644
--- a/app/javascript/shared/mixins/alertMixin.js
+++ b/app/javascript/shared/mixins/alertMixin.js
@@ -1,7 +1,7 @@
 export default {
   methods: {
-    showAlert(message) {
-      bus.$emit('newToastMessage', message);
+    showAlert(message, action) {
+      bus.$emit('newToastMessage', message, action);
     },
   },
 };

From fcd2b892bf673c3c018c85131eea5be29368d36b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:46:09 -0800
Subject: [PATCH 011/101] chore(deps): bump follow-redirects from 1.14.5 to
 1.14.7 (#3760)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.5...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9fcc42b62..d500d19fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6914,9 +6914,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0:
-  version "1.14.5"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381"
-  integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 for-in@^1.0.2:
   version "1.0.2"

From 290196d43bca76941297855f3e57260e86d17cca Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 13 Jan 2022 21:38:10 -0800
Subject: [PATCH 012/101] chore: Clean up assignment logic (#3763)

---
 app/models/concerns/assignment_handler.rb | 2 +-
 app/models/notification.rb                | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/assignment_handler.rb b/app/models/concerns/assignment_handler.rb
index 4fd778d45..76ff47aca 100644
--- a/app/models/concerns/assignment_handler.rb
+++ b/app/models/concerns/assignment_handler.rb
@@ -4,7 +4,7 @@ module AssignmentHandler
 
   included do
     before_save :ensure_assignee_is_from_team
-    after_update :notify_assignment_change, :process_assignment_activities
+    after_commit :notify_assignment_change, :process_assignment_activities
   end
 
   private
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 1577f8dda..7599d4d6e 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -71,6 +71,7 @@ class Notification < ApplicationRecord
   end
 
   # TODO: move to a data presenter
+  # rubocop:disable Metrics/CyclomaticComplexity
   def push_message_title
     case notification_type
     when 'conversation_creation'
@@ -81,14 +82,15 @@ class Notification < ApplicationRecord
       I18n.t(
         'notifications.notification_title.assigned_conversation_new_message',
         display_id: conversation.display_id,
-        content: primary_actor.content&.truncate_words(10)
+        content: primary_actor&.content&.truncate_words(10)
       )
     when 'conversation_mention'
-      "[##{conversation.display_id}] #{transform_user_mention_content primary_actor.content}"
+      "[##{conversation&.display_id}] #{transform_user_mention_content primary_actor&.content}"
     else
       ''
     end
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def conversation
     return primary_actor.conversation if %w[assigned_conversation_new_message conversation_mention].include? notification_type

From 4398734bdfd8e59df33a5e75896c8b4aa0062dd9 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 17 Jan 2022 09:18:54 +0530
Subject: [PATCH 013/101] feat: Adds the ability to have custom view for
 conversations  (#3666)

* feat: Adds the ability to save custom filters and display folders on the sidebar

* Minor fixes

* Review fixes

* Review fixes

* i18n fixes

* Shows conversations when the user click on the folder sidebar item

* Spacing fixes

* Review fixes

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/dashboard/api/customViews.js   |  14 ++
 .../dashboard/components/ChatList.vue         | 122 +++++++++++++++---
 .../dashboard/components/layout/Sidebar.vue   |   3 +
 .../config/sidebarItems/conversations.js      |   2 +
 .../layout/sidebarComponents/Secondary.vue    |  28 ++++
 .../sidebarComponents/SecondaryNavItem.vue    |   2 +-
 .../widgets/conversation/ConversationCard.vue |   5 +
 app/javascript/dashboard/helper/URLHelper.js  |   3 +
 .../i18n/locale/en/advancedFilters.json       |  14 ++
 .../dashboard/i18n/locale/en/settings.json    |   7 +-
 .../conversation/ConversationView.vue         |   5 +
 .../conversation/conversation.routes.js       |  19 +++
 .../dashboard/customviews/AddCustomViews.vue  |  97 ++++++++++++++
 app/javascript/dashboard/store/index.js       |   2 +
 .../dashboard/store/modules/customViews.js    |  79 ++++++++++++
 .../modules/specs/customViews/actions.spec.js |  72 +++++++++++
 .../modules/specs/customViews/fixtures.js     |  42 ++++++
 .../modules/specs/customViews/getters.spec.js |  65 ++++++++++
 .../specs/customViews/mutations.spec.js       |  29 +++++
 .../dashboard/store/mutation-types.js         |   6 +
 .../FluentIcon/dashboard-icons.json           |   1 +
 21 files changed, 594 insertions(+), 23 deletions(-)
 create mode 100644 app/javascript/dashboard/api/customViews.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
 create mode 100644 app/javascript/dashboard/store/modules/customViews.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js

diff --git a/app/javascript/dashboard/api/customViews.js b/app/javascript/dashboard/api/customViews.js
new file mode 100644
index 000000000..bb09047ba
--- /dev/null
+++ b/app/javascript/dashboard/api/customViews.js
@@ -0,0 +1,14 @@
+/* global axios */
+import ApiClient from './ApiClient';
+
+class CustomViewsAPI extends ApiClient {
+  constructor() {
+    super('custom_filters', { accountScoped: true });
+  }
+
+  getCustomViews() {
+    return axios.get(this.url);
+  }
+}
+
+export default new CustomViewsAPI();
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index bb7858e6c..8affb6066 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -1,26 +1,39 @@
-l<template>
+<template>
   <div class="conversations-list-wrap">
     <slot></slot>
-    <div class="chat-list__top" :class="{ filter__applied: hasAppliedFilters }">
+    <div
+      class="chat-list__top"
+      :class="{ filter__applied: hasAppliedFiltersOrActiveCustomViews }"
+    >
       <h1 class="page-title text-truncate" :title="pageTitle">
         {{ pageTitle }}
       </h1>
 
       <div class="filter--actions">
         <chat-filter
-          v-if="!hasAppliedFilters"
+          v-if="!hasAppliedFiltersOrActiveCustomViews"
           @statusFilterChange="updateStatusType"
         />
+        <div v-if="hasAppliedFilters && !hasActiveCustomViews">
+          <woot-button
+            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.ADD.SAVE_BUTTON')"
+            size="tiny"
+            variant="smooth"
+            color-scheme="secondary"
+            icon="save"
+            @click="onClickOpenAddCustomViewsModal"
+          />
+          <woot-button
+            v-tooltip.top-end="$t('FILTER.CLEAR_BUTTON_LABEL')"
+            size="tiny"
+            variant="smooth"
+            color-scheme="alert"
+            icon="dismiss-circle"
+            @click="resetAndFetchData"
+          />
+        </div>
         <woot-button
-          v-else
-          size="small"
-          variant="clear"
-          color-scheme="alert"
-          @click="resetAndFetchData"
-        >
-          {{ $t('FILTER.CLEAR_BUTTON_LABEL') }}
-        </woot-button>
-        <woot-button
+          v-if="!hasActiveCustomViews"
           v-tooltip.top-end="$t('FILTER.TOOLTIP_LABEL')"
           variant="clear"
           color-scheme="secondary"
@@ -33,8 +46,14 @@ l<template>
       </div>
     </div>
 
+    <add-custom-views
+      v-if="showAddCustomViewsModal"
+      :custom-views-query="customViewsQuery"
+      @close="onCloseAddCustomViewsModal"
+    />
+
     <chat-type-tabs
-      v-if="!hasAppliedFilters"
+      v-if="!hasAppliedFiltersOrActiveCustomViews"
       :items="assigneeTabItems"
       :active-tab="activeAssigneeTab"
       class="tab--chat-type"
@@ -51,6 +70,7 @@ l<template>
         :key="chat.id"
         :active-label="label"
         :team-id="teamId"
+        :custom-views-id="customViewsId"
         :chat="chat"
         :conversation-type="conversationType"
         :show-assignee="showAssigneeInConversationCard"
@@ -108,6 +128,7 @@ import conversationMixin from '../mixins/conversations';
 import wootConstants from '../constants';
 import advancedFilterTypes from './widgets/conversation/advancedFilterItems';
 import filterQueryGenerator from '../helper/filterQueryGenerator.js';
+import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
 
 import {
   hasPressedAltAndJKey,
@@ -116,6 +137,7 @@ import {
 
 export default {
   components: {
+    AddCustomViews,
     ChatTypeTabs,
     ConversationCard,
     ChatFilter,
@@ -139,6 +161,10 @@ export default {
       type: String,
       default: '',
     },
+    customViewsId: {
+      type: [String, Number],
+      default: 0,
+    },
   },
   data() {
     return {
@@ -149,6 +175,8 @@ export default {
         ...filter,
         attributeName: this.$t(`FILTER.ATTRIBUTES.${filter.attributeI18nKey}`),
       })),
+      customViewsQuery: {},
+      showAddCustomViewsModal: false,
     };
   },
   computed: {
@@ -163,10 +191,24 @@ export default {
       activeInbox: 'getSelectedInbox',
       conversationStats: 'conversationStats/getStats',
       appliedFilters: 'getAppliedConversationFilters',
+      customViews: 'customViews/getCustomViews',
     }),
     hasAppliedFilters() {
       return this.appliedFilters.length;
     },
+    hasActiveCustomViews() {
+      return this.activeCustomView.length > 0 && this.customViewsId !== 0;
+    },
+    hasAppliedFiltersOrActiveCustomViews() {
+      return this.hasAppliedFilters || this.hasActiveCustomViews;
+    },
+    savedCustomViewsValue() {
+      if (this.hasActiveCustomViews) {
+        const payload = this.activeCustomView[0].query;
+        this.fetchSavedFilteredConversations(payload);
+      }
+      return {};
+    },
     assigneeTabItems() {
       return this.$t('CHAT_LIST.ASSIGNEE_TYPE_TABS').map(item => {
         const count = this.conversationStats[item.COUNT_KEY] || 0;
@@ -189,7 +231,9 @@ export default {
       );
     },
     currentPageFilterKey() {
-      return this.hasAppliedFilters ? 'appliedFilters' : this.activeAssigneeTab;
+      return this.hasAppliedFiltersOrActiveCustomViews
+        ? 'appliedFilters'
+        : this.activeAssigneeTab;
     },
     currentFiltersPage() {
       return this.$store.getters['conversationPage/getCurrentPageFilter'](
@@ -212,6 +256,9 @@ export default {
         conversationType: this.conversationType
           ? this.conversationType
           : undefined,
+        customViews: this.hasActiveCustomViews
+          ? this.savedCustomViewsValue
+          : undefined,
       };
     },
     pageTitle() {
@@ -227,11 +274,14 @@ export default {
       if (this.conversationType === 'mention') {
         return this.$t('CHAT_LIST.MENTION_HEADING');
       }
+      if (this.hasActiveCustomViews) {
+        return this.activeCustomView[0].name;
+      }
       return this.$t('CHAT_LIST.TAB_HEADING');
     },
     conversationList() {
       let conversationList = [];
-      if (!this.hasAppliedFilters) {
+      if (!this.hasAppliedFiltersOrActiveCustomViews) {
         const filters = this.conversationFilters;
         if (this.activeAssigneeTab === 'me') {
           conversationList = [...this.mineChatsList(filters)];
@@ -246,6 +296,14 @@ export default {
 
       return conversationList;
     },
+    activeCustomView() {
+      if (this.customViewsId) {
+        return this.customViews.filter(
+          view => view.id === Number(this.customViewsId)
+        );
+      }
+      return [];
+    },
     activeTeam() {
       if (this.teamId) {
         return this.$store.getters['teams/getTeam'](this.teamId);
@@ -266,6 +324,9 @@ export default {
     conversationType() {
       this.resetAndFetchData();
     },
+    activeCustomView() {
+      this.resetAndFetchData();
+    },
   },
   mounted() {
     this.$store.dispatch('setChatFilter', this.activeStatus);
@@ -280,10 +341,17 @@ export default {
       if (this.$route.name !== 'home') {
         this.$router.push({ name: 'home' });
       }
+      this.customViewsQuery = { payload: payload };
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
       this.fetchFilteredConversations(payload);
     },
+    onClickOpenAddCustomViewsModal() {
+      this.showAddCustomViewsModal = true;
+    },
+    onCloseAddCustomViewsModal() {
+      this.showAddCustomViewsModal = false;
+    },
     onToggleAdvanceFiltersModal() {
       this.showAdvancedFilters = !this.showAdvancedFilters;
     },
@@ -335,6 +403,13 @@ export default {
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
       this.$store.dispatch('clearConversationFilters');
+      if (this.hasActiveCustomViews) {
+        const payload = this.activeCustomView[0].query;
+        this.fetchSavedFilteredConversations(payload);
+      }
+      if (this.customViewsId) {
+        return;
+      }
       this.fetchConversations();
     },
     fetchConversations() {
@@ -343,8 +418,12 @@ export default {
         .then(() => this.$emit('conversation-load'));
     },
     loadMoreConversations() {
-      if (!this.hasAppliedFilters) {
+      if (!this.hasAppliedFiltersOrActiveCustomViews) {
         this.fetchConversations();
+      }
+      if (this.hasActiveCustomViews) {
+        const payload = this.activeCustomView[0].query;
+        this.fetchSavedFilteredConversations(payload);
       } else {
         this.fetchFilteredConversations(this.appliedFilters);
       }
@@ -359,6 +438,15 @@ export default {
         .then(() => this.$emit('conversation-load'));
       this.showAdvancedFilters = false;
     },
+    fetchSavedFilteredConversations(payload) {
+      let page = this.currentFiltersPage + 1;
+      this.$store
+        .dispatch('fetchFilteredConversations', {
+          queryData: payload,
+          page,
+        })
+        .then(() => this.$emit('conversation-load'));
+    },
     updateAssigneeTab(selectedTab) {
       if (this.activeAssigneeTab !== selectedTab) {
         bus.$emit('clearSearchInput');
@@ -413,7 +501,7 @@ export default {
 }
 
 .filter__applied {
-  padding: var(--space-slab) 0 !important;
+  padding: 0 0 var(--space-slab) 0 !important;
   border-bottom: 1px solid var(--color-border);
 }
 </style>
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index cd0d0a08e..448603c6f 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -14,6 +14,7 @@
       :inboxes="inboxes"
       :labels="labels"
       :teams="teams"
+      :custom-views="customViews"
       :menu-config="activeSecondaryMenu"
       :current-role="currentRole"
       @add-label="showAddLabelPopup"
@@ -87,6 +88,7 @@ export default {
       currentUser: 'getCurrentUser',
       globalConfig: 'globalConfig/get',
       inboxes: 'inboxes/getInboxes',
+      customViews: 'customViews/getCustomViews',
       accountId: 'getCurrentAccountId',
       currentRole: 'getCurrentRole',
       labels: 'labels/getLabelsOnSidebar',
@@ -122,6 +124,7 @@ export default {
   mounted() {
     this.$store.dispatch('labels/get');
     this.$store.dispatch('inboxes/get');
+    this.$store.dispatch('customViews/get');
     this.$store.dispatch('notifications/unReadCount');
     this.$store.dispatch('teams/get');
     this.$store.dispatch('attributes/get');
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js b/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js
index 550a9f1d5..c19cc1846 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js
@@ -14,6 +14,8 @@ const conversations = accountId => ({
     'conversations_through_team',
     'conversation_mentions',
     'conversation_through_mentions',
+    'custom_view_conversations',
+    'conversations_through_custom_view',
   ],
   menuItems: [
     {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 328bda1b5..72f559fc1 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -40,6 +40,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    customViews: {
+      type: Array,
+      default: () => [],
+    },
     menuConfig: {
       type: Object,
       default: () => {},
@@ -150,11 +154,35 @@ export default {
         })),
       };
     },
+    customViewsSection() {
+      return {
+        icon: 'folder',
+        label: 'CUSTOM_VIEWS',
+        hasSubMenu: true,
+        key: 'custom_view',
+        children: this.customViews
+          .filter(view => view.filter_type === 'conversation')
+          .map(view => ({
+            id: view.id,
+            label: view.name,
+            truncateLabel: true,
+            toState: frontendURL(
+              `accounts/${this.accountId}/custom_view/${view.id}`
+            ),
+          })),
+      };
+    },
     additionalSecondaryMenuItems() {
       let conversationMenuItems = [this.inboxSection, this.labelSection];
       if (this.teams.length) {
         conversationMenuItems = [this.teamSection, ...conversationMenuItems];
       }
+      if (this.customViews.length) {
+        conversationMenuItems = [
+          this.customViewsSection,
+          ...conversationMenuItems,
+        ];
+      }
       return {
         conversations: conversationMenuItems,
         contacts: [this.contactLabelSection],
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
index 281a1394e..fe8e6d69f 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
@@ -7,7 +7,7 @@
       v-else
       class="secondary-menu--title secondary-menu--link fs-small"
       :class="computedClass"
-      :to="menuItem.toState"
+      :to="menuItem && menuItem.toState"
     >
       <fluent-icon
         :icon="menuItem.icon"
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 3a4c0d7d2..3e509eb9f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -130,6 +130,10 @@ export default {
       type: [String, Number],
       default: 0,
     },
+    customViewsId: {
+      type: [String, Number],
+      default: 0,
+    },
     showAssignee: {
       type: Boolean,
       default: false,
@@ -248,6 +252,7 @@ export default {
         id: chat.id,
         label: this.activeLabel,
         teamId: this.teamId,
+        customViewsId: this.customViewsId,
         conversationType: this.conversationType,
       });
       router.push({ path: frontendURL(path) });
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index f50b3f6dc..120d6f2de 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -12,6 +12,7 @@ export const conversationUrl = ({
   label,
   teamId,
   conversationType = '',
+  customViewsId,
 }) => {
   let url = `accounts/${accountId}/conversations/${id}`;
   if (activeInbox) {
@@ -20,6 +21,8 @@ export const conversationUrl = ({
     url = `accounts/${accountId}/label/${label}/conversations/${id}`;
   } else if (teamId) {
     url = `accounts/${accountId}/team/${teamId}/conversations/${id}`;
+  } else if (customViewsId && customViewsId !== 0) {
+    url = `accounts/${accountId}/custom_view/${customViewsId}/conversations/${id}`;
   } else if (conversationType === 'mention') {
     url = `accounts/${accountId}/mentions/conversations/${id}`;
   }
diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index f2292db8e..92a69f0b7 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -32,6 +32,20 @@
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Cancel",
+        "API": {
+          "SUCCESS_MESSAGE": "Custom view created successfully",
+          "ERROR_MESSAGE": "Error while creating custom view"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index ffe89678c..ceacb2486 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -72,11 +72,7 @@
       },
       "AVAILABILITY": {
         "LABEL": "Availability",
-        "STATUSES_LIST": [
-          "Online",
-          "Busy",
-          "Offline"
-        ]
+        "STATUSES_LIST": ["Online", "Busy", "Offline"]
       },
       "EMAIL": {
         "LABEL": "Your email address",
@@ -153,6 +149,7 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS": "Folders",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index 72aa2d44b..b1a88223d 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -5,6 +5,7 @@
       :label="label"
       :team-id="teamId"
       :conversation-type="conversationType"
+      :custom-views-id="customViewsId"
       @conversation-load="onConversationLoad"
     >
       <pop-over-search />
@@ -54,6 +55,10 @@ export default {
       type: String,
       default: '',
     },
+    customViewsId: {
+      type: [String, Number],
+      default: 0,
+    },
   },
   data() {
     return {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
index 01efb32ba..45e05b489 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
@@ -83,6 +83,25 @@ export default {
         teamId: route.params.teamId,
       }),
     },
+    {
+      path: frontendURL('accounts/:accountId/custom_view/:id'),
+      name: 'custom_view_conversations',
+      roles: ['administrator', 'agent'],
+      component: ConversationView,
+      props: route => ({ customViewsId: route.params.id }),
+    },
+    {
+      path: frontendURL(
+        'accounts/:accountId/custom_view/:id/conversations/:conversation_id'
+      ),
+      name: 'conversations_through_custom_view',
+      roles: ['administrator', 'agent'],
+      component: ConversationView,
+      props: route => ({
+        conversationId: route.params.conversation_id,
+        customViewsId: route.params.id,
+      }),
+    },
     {
       path: frontendURL('accounts/:accountId/mentions/conversations'),
       name: 'conversation_mentions',
diff --git a/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue b/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
new file mode 100644
index 000000000..319dbab24
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
@@ -0,0 +1,97 @@
+<template>
+  <woot-modal :show.sync="show" :on-close="onClose">
+    <woot-modal-header :header-title="$t('FILTER.CUSTOM_VIEWS.ADD.TITLE')" />
+    <form class="row" @submit.prevent="saveCustomViews">
+      <div class="medium-12 columns">
+        <woot-input
+          v-model="name"
+          :label="$t('FILTER.CUSTOM_VIEWS.ADD.LABEL')"
+          type="text"
+          :error="
+            $v.name.$error ? $t('FILTER.CUSTOM_VIEWS.ADD.ERROR_MESSAGE') : ''
+          "
+          :class="{ error: $v.name.$error }"
+          :placeholder="$t('FILTER.CUSTOM_VIEWS.ADD.PLACEHOLDER')"
+          @blur="$v.name.$touch"
+        />
+
+        <div class="modal-footer">
+          <woot-button :disabled="isButtonDisabled">
+            {{ $t('FILTER.CUSTOM_VIEWS.ADD.SAVE_BUTTON') }}
+          </woot-button>
+          <woot-button variant="clear" @click.prevent="onClose">
+            {{ $t('FILTER.CUSTOM_VIEWS.ADD.CANCEL_BUTTON') }}
+          </woot-button>
+        </div>
+      </div>
+    </form>
+  </woot-modal>
+</template>
+
+<script>
+import { required, minLength } from 'vuelidate/lib/validators';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  mixins: [alertMixin],
+  props: {
+    filterType: {
+      type: Number,
+      default: 0,
+    },
+    customViewsQuery: {
+      type: Object,
+      default: () => {},
+    },
+  },
+
+  data() {
+    return {
+      show: true,
+      name: '',
+    };
+  },
+
+  computed: {
+    isButtonDisabled() {
+      return this.$v.name.$invalid;
+    },
+  },
+
+  validations: {
+    name: {
+      required,
+      minLength: minLength(1),
+    },
+  },
+
+  methods: {
+    onClose() {
+      this.$emit('close');
+    },
+    async saveCustomViews() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        return;
+      }
+      try {
+        await this.$store.dispatch('customViews/create', {
+          name: this.name,
+          filter_type: this.filterType,
+          query: this.customViewsQuery,
+        });
+        this.alertMessage = this.$t(
+          'FILTER.CUSTOM_VIEWS.ADD.API.SUCCESS_MESSAGE'
+        );
+        this.onClose();
+      } catch (error) {
+        const errorMessage = error?.message;
+        this.alertMessage =
+          errorMessage || this.$t('FILTER.CUSTOM_VIEWS.ADD.API.ERROR_MESSAGE');
+      } finally {
+        this.showAlert(this.alertMessage);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index b14b9d0b0..77c62848a 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -31,6 +31,7 @@ import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
 import attributes from './modules/attributes';
+import customViews from './modules/customViews';
 
 Vue.use(Vuex);
 export default new Vuex.Store({
@@ -65,5 +66,6 @@ export default new Vuex.Store({
     userNotificationSettings,
     webhooks,
     attributes,
+    customViews,
   },
 });
diff --git a/app/javascript/dashboard/store/modules/customViews.js b/app/javascript/dashboard/store/modules/customViews.js
new file mode 100644
index 000000000..f1c04f01c
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/customViews.js
@@ -0,0 +1,79 @@
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import types from '../mutation-types';
+import CustomViewsAPI from '../../api/customViews';
+
+export const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isCreating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getUIFlags(_state) {
+    return _state.uiFlags;
+  },
+  getCustomViews(_state) {
+    return _state.records;
+  },
+};
+
+export const actions = {
+  get: async function getCustomViews({ commit }) {
+    commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isFetching: true });
+    try {
+      const response = await CustomViewsAPI.getCustomViews();
+      commit(types.SET_CUSTOM_VIEW, response.data);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isFetching: false });
+    }
+  },
+  create: async function createCustomViews({ commit }, obj) {
+    commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: true });
+    try {
+      const response = await CustomViewsAPI.create(obj);
+      commit(types.ADD_CUSTOM_VIEW, response.data);
+    } catch (error) {
+      const errorMessage = error?.response?.data?.message;
+      throw new Error(errorMessage);
+    } finally {
+      commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false });
+    }
+  },
+  delete: async ({ commit }, id) => {
+    commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: true });
+    try {
+      await CustomViewsAPI.delete(id);
+      commit(types.DELETE_CUSTOM_VIEW, id);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_CUSTOM_VIEW_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+
+  [types.ADD_CUSTOM_VIEW]: MutationHelpers.create,
+  [types.SET_CUSTOM_VIEW]: MutationHelpers.set,
+  [types.DELETE_CUSTOM_VIEW]: MutationHelpers.destroy,
+};
+
+export default {
+  namespaced: true,
+  actions,
+  state,
+  getters,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
new file mode 100644
index 000000000..32d748a1b
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
@@ -0,0 +1,72 @@
+import axios from 'axios';
+import { actions } from '../../customViews';
+import * as types from '../../../mutation-types';
+import customViewList from './fixtures';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: customViewList });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isFetching: true }],
+        [types.default.SET_CUSTOM_VIEW, customViewList],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isFetching: true }],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: customViewList[0] });
+      await actions.create({ commit }, customViewList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: true }],
+        [types.default.ADD_CUSTOM_VIEW, customViewList[0]],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.create({ commit })).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: true }],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({ data: customViewList[0] });
+      await actions.delete({ commit }, customViewList[0].id);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: true }],
+        [types.default.DELETE_CUSTOM_VIEW, customViewList[0].id],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.delete({ commit }, customViewList[0].id)
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: true }],
+        [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
new file mode 100644
index 000000000..54917a0b0
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
@@ -0,0 +1,42 @@
+export default [
+  {
+    name: 'Custom view',
+    filter_type: 'conversation',
+    query: {
+      payload: [
+        {
+          attribute_key: 'assignee_id',
+          filter_operator: 'equal_to',
+          values: [45],
+          query_operator: 'and',
+        },
+        {
+          attribute_key: 'inbox_id',
+          filter_operator: 'equal_to',
+          values: [144],
+          query_operator: 'and',
+        },
+      ],
+    },
+  },
+  {
+    name: 'Custom view 1',
+    filter_type: 'conversation',
+    query: {
+      payload: [
+        {
+          attribute_key: 'browser_language',
+          filter_operator: 'equal_to',
+          values: ['eng'],
+          query_operator: 'or',
+        },
+        {
+          attribute_key: 'campaign_id',
+          filter_operator: 'equal_to',
+          values: [15],
+          query_operator: 'and',
+        },
+      ],
+    },
+  },
+];
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
new file mode 100644
index 000000000..e71e8fd58
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
@@ -0,0 +1,65 @@
+import { getters } from '../../customViews';
+import customViewList from './fixtures';
+
+describe('#getters', () => {
+  it('getCustomViews', () => {
+    const state = { records: customViewList };
+    expect(getters.getCustomViews(state)).toEqual([
+      {
+        name: 'Custom view',
+        filter_type: 'conversation',
+        query: {
+          payload: [
+            {
+              attribute_key: 'assignee_id',
+              filter_operator: 'equal_to',
+              values: [45],
+              query_operator: 'and',
+            },
+            {
+              attribute_key: 'inbox_id',
+              filter_operator: 'equal_to',
+              values: [144],
+              query_operator: 'and',
+            },
+          ],
+        },
+      },
+      {
+        name: 'Custom view 1',
+        filter_type: 'conversation',
+        query: {
+          payload: [
+            {
+              attribute_key: 'browser_language',
+              filter_operator: 'equal_to',
+              values: ['eng'],
+              query_operator: 'or',
+            },
+            {
+              attribute_key: 'campaign_id',
+              filter_operator: 'equal_to',
+              values: [15],
+              query_operator: 'and',
+            },
+          ],
+        },
+      },
+    ]);
+  });
+
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isFetching: true,
+        isCreating: false,
+        isDeleting: false,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isFetching: true,
+      isCreating: false,
+      isDeleting: false,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js
new file mode 100644
index 000000000..05da48b6d
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/customViews/mutations.spec.js
@@ -0,0 +1,29 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../customViews';
+import customViewList from './fixtures';
+
+describe('#mutations', () => {
+  describe('#SET_CUSTOM_VIEW', () => {
+    it('set custom view records', () => {
+      const state = { records: [] };
+      mutations[types.SET_CUSTOM_VIEW](state, customViewList);
+      expect(state.records).toEqual(customViewList);
+    });
+  });
+
+  describe('#ADD_CUSTOM_VIEW', () => {
+    it('push newly created custom views to the store', () => {
+      const state = { records: [customViewList] };
+      mutations[types.ADD_CUSTOM_VIEW](state, customViewList[0]);
+      expect(state.records).toEqual([customViewList, customViewList[0]]);
+    });
+  });
+
+  describe('#DELETE_CUSTOM_VIEW', () => {
+    it('delete custom view record', () => {
+      const state = { records: [customViewList[0]] };
+      mutations[types.DELETE_CUSTOM_VIEW](state, customViewList[0]);
+      expect(state.records).toEqual([customViewList[0]]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index b723776c5..e99412c60 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -188,4 +188,10 @@ export default {
   ADD_CUSTOM_ATTRIBUTE: 'ADD_CUSTOM_ATTRIBUTE',
   EDIT_CUSTOM_ATTRIBUTE: 'EDIT_CUSTOM_ATTRIBUTE',
   DELETE_CUSTOM_ATTRIBUTE: 'DELETE_CUSTOM_ATTRIBUTE',
+
+  // Custom Views
+  SET_CUSTOM_VIEW_UI_FLAG: 'SET_CUSTOM_VIEW_UI_FLAG',
+  SET_CUSTOM_VIEW: 'SET_CUSTOM_VIEW',
+  ADD_CUSTOM_VIEW: 'ADD_CUSTOM_VIEW',
+  DELETE_CUSTOM_VIEW: 'DELETE_CUSTOM_VIEW',
 };
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 5f8a72633..a8840937c 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -71,6 +71,7 @@
   "power-outline": "M8.204 4.82a.75.75 0 0 1 .634 1.36A7.51 7.51 0 0 0 4.5 12.991c0 4.148 3.358 7.51 7.499 7.51s7.499-3.362 7.499-7.51a7.51 7.51 0 0 0-4.323-6.804.75.75 0 1 1 .637-1.358 9.01 9.01 0 0 1 5.186 8.162c0 4.976-4.029 9.01-9 9.01C7.029 22 3 17.966 3 12.99a9.01 9.01 0 0 1 5.204-8.17ZM12 2.496a.75.75 0 0 1 .743.648l.007.102v7.5a.75.75 0 0 1-1.493.102l-.007-.102v-7.5a.75.75 0 0 1 .75-.75Z",
   "quote-outline": "M7.5 6a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.555-1.24 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.64-1.737 2.66-3.674 3.077-5.859A2.5 2.5 0 1 1 7.5 6Zm9 0a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.56-1.238 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.643-1.738 2.662-3.672 3.078-5.859A2.5 2.5 0 1 1 16.5 6Zm-9 1.5a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Zm9 0a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Z",
   "resize-large-outline": "M6.25 4.5A1.75 1.75 0 0 0 4.5 6.25v1.5a.75.75 0 0 1-1.5 0v-1.5A3.25 3.25 0 0 1 6.25 3h1.5a.75.75 0 0 1 0 1.5h-1.5ZM19.5 6.25a1.75 1.75 0 0 0-1.75-1.75h-1.5a.75.75 0 0 1 0-1.5h1.5A3.25 3.25 0 0 1 21 6.25v1.5a.75.75 0 0 1-1.5 0v-1.5ZM19.5 17.75a1.75 1.75 0 0 1-1.75 1.75h-1.5a.75.75 0 0 0 0 1.5h1.5A3.25 3.25 0 0 0 21 17.75v-1.5a.75.75 0 0 0-1.5 0v1.5ZM4.5 17.75c0 .966.784 1.75 1.75 1.75h1.5a.75.75 0 0 1 0 1.5h-1.5A3.25 3.25 0 0 1 3 17.75v-1.5a.75.75 0 0 1 1.5 0v1.5ZM8.25 6A2.25 2.25 0 0 0 6 8.25v7.5A2.25 2.25 0 0 0 8.25 18h7.5A2.25 2.25 0 0 0 18 15.75v-7.5A2.25 2.25 0 0 0 15.75 6h-7.5ZM7.5 8.25a.75.75 0 0 1 .75-.75h7.5a.75.75 0 0 1 .75.75v7.5a.75.75 0 0 1-.75.75h-7.5a.75.75 0 0 1-.75-.75v-7.5Z",
+  "save-outline": "M3 5.75A2.75 2.75 0 0 1 5.75 3h9.964a3.25 3.25 0 0 1 2.299.952l2.035 2.035c.61.61.952 1.437.952 2.299v9.964A2.75 2.75 0 0 1 18.25 21H5.75A2.75 2.75 0 0 1 3 18.25V5.75ZM5.75 4.5c-.69 0-1.25.56-1.25 1.25v12.5c0 .69.56 1.25 1.25 1.25H6v-5.25A2.25 2.25 0 0 1 8.25 12h7.5A2.25 2.25 0 0 1 18 14.25v5.25h.25c.69 0 1.25-.56 1.25-1.25V8.286c0-.465-.184-.91-.513-1.238l-2.035-2.035a1.75 1.75 0 0 0-.952-.49V7.25a2.25 2.25 0 0 1-2.25 2.25h-4.5A2.25 2.25 0 0 1 7 7.25V4.5H5.75Zm10.75 15v-5.25a.75.75 0 0 0-.75-.75h-7.5a.75.75 0 0 0-.75.75v5.25h9Zm-8-15v2.75c0 .414.336.75.75.75h4.5a.75.75 0 0 0 .75-.75V4.5h-6Z",
   "search-outline": "M10 2.75a7.25 7.25 0 0 1 5.63 11.819l4.9 4.9a.75.75 0 0 1-.976 1.134l-.084-.073-4.901-4.9A7.25 7.25 0 1 1 10 2.75Zm0 1.5a5.75 5.75 0 1 0 0 11.5 5.75 5.75 0 0 0 0-11.5Z",
   "send-outline": "M5.694 12 2.299 3.272c-.236-.607.356-1.188.942-.982l.093.04 18 9a.75.75 0 0 1 .097 1.283l-.097.058-18 9c-.583.291-1.217-.244-1.065-.847l.03-.096L5.694 12 2.299 3.272 5.694 12ZM4.402 4.54l2.61 6.71h6.627a.75.75 0 0 1 .743.648l.007.102a.75.75 0 0 1-.649.743l-.101.007H7.01l-2.609 6.71L19.322 12 4.401 4.54Z",
   "send-clock-outline": "M5.694 12 2.299 3.272c-.236-.608.356-1.189.942-.982l.093.04 18 9a.752.752 0 0 1 .264 1.124 6.473 6.473 0 0 0-4.272-1.452L4.402 4.54l2.61 6.71h6.627a.75.75 0 0 1 .724.556c-.472.26-.909.578-1.3.944H7.011l-2.609 6.71 6.753-3.377a6.522 6.522 0 0 0-.147 1.75l-7.674 3.838c-.583.291-1.217-.245-1.065-.847l.03-.096L5.694 12ZM23 17.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0Zm-5.5 0h2a.5.5 0 1 1 0 1H17a.5.5 0 0 1-.5-.5v-3a.5.5 0 0 1 1 0v2.5Z",

From 6deb3764dcd629b9d9d0bc82016ff9d7359095c4 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Mon, 17 Jan 2022 20:35:53 +0530
Subject: [PATCH 014/101] Fix: Pagination bug with filters payload (#3747)

* Removes the last operators value

* Moved removing the last operator to the payload generator

* Update app/javascript/dashboard/helper/filterQueryGenerator.js

This makes sure the last operator is never sent to the request

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>

* Fixed the test specs

* Fixed the intendation and added comments

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../widgets/conversation/ConversationAdvancedFilter.vue      | 1 -
 app/javascript/dashboard/helper/filterQueryGenerator.js      | 5 ++++-
 .../dashboard/helper/specs/filterQueryGenerator.spec.js      | 3 +--
 .../contacts/components/ContactsAdvancedFilters.vue          | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
index c79731425..acf7f3cfd 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
@@ -192,7 +192,6 @@ export default {
         'setConversationFilters',
         JSON.parse(JSON.stringify(this.appliedFilters))
       );
-      this.appliedFilters[this.appliedFilters.length - 1].query_operator = null;
       this.$emit('applyFilter', this.appliedFilters);
     },
     resetFilter(index, currentFilter) {
diff --git a/app/javascript/dashboard/helper/filterQueryGenerator.js b/app/javascript/dashboard/helper/filterQueryGenerator.js
index f2fbd39aa..590debf03 100644
--- a/app/javascript/dashboard/helper/filterQueryGenerator.js
+++ b/app/javascript/dashboard/helper/filterQueryGenerator.js
@@ -11,7 +11,10 @@ const generatePayload = data => {
     }
     return item;
   });
-
+  // For every query added, the query_operator is set default to and so the
+  // last query will have an extra query_operator, this would break the api.
+  // Setting this to null for all query payload
+  payload[payload.length - 1].query_operator = undefined;
   return { payload };
 };
 
diff --git a/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js b/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js
index aee524c5e..9120ea930 100644
--- a/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js
+++ b/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js
@@ -31,7 +31,7 @@ const testData = [
     attribute_key: 'id',
     filter_operator: 'equal_to',
     values: 'This is a test',
-    query_operator: null,
+    query_operator: 'or',
   },
 ];
 
@@ -53,7 +53,6 @@ const finalResult = {
       attribute_key: 'id',
       filter_operator: 'equal_to',
       values: ['This is a test'],
-      query_operator: null,
     },
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
index 5c0aae26c..a91f4e6d4 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
@@ -160,7 +160,6 @@ export default {
         'contacts/setContactFilters',
         JSON.parse(JSON.stringify(this.appliedFilters))
       );
-      this.appliedFilters[this.appliedFilters.length - 1].query_operator = null;
       this.$emit('applyFilter', this.appliedFilters);
     },
     resetFilter(index, currentFilter) {

From c64cffb294da26bc9ad13c5d167b885d6e57d544 Mon Sep 17 00:00:00 2001
From: Amal Jose A <howareyouami@gmail.com>
Date: Tue, 18 Jan 2022 07:37:51 +0530
Subject: [PATCH 015/101] fix: Update the hardcoded scroll-width to match with
 the current table length (#3774)

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../routes/dashboard/settings/campaigns/CampaignsTable.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
index 6dd24bd42..993376f12 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
@@ -4,7 +4,7 @@
     <ve-table
       v-else
       :columns="columns"
-      scroll-width="155rem"
+      scroll-width="190rem"
       :table-data="tableData"
       :border-around="true"
     />

From 185f916b2a73ddfdcd25e54a8e4bd05d9e23b1d6 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 19 Jan 2022 09:40:32 +0530
Subject: [PATCH 016/101] feat: Adds the ability to delete the saved custom
 views (#3780)

* feat: Adds the ability to delete the saved custom views

* Removed unused tag

* Review fixes

* Review fixes

* Update DeleteCustomViews.vue
---
 .../dashboard/components/ChatList.vue         | 51 ++++++++++--
 .../i18n/locale/en/advancedFilters.json       | 15 ++++
 .../customviews/DeleteCustomViews.vue         | 77 +++++++++++++++++++
 3 files changed, 135 insertions(+), 8 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 8affb6066..03e5b68bc 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -32,8 +32,20 @@
             @click="resetAndFetchData"
           />
         </div>
+        <div v-if="hasActiveCustomViews">
+          <woot-button
+            v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.DELETE.DELETE_BUTTON')"
+            size="tiny"
+            variant="smooth"
+            color-scheme="alert"
+            icon="delete"
+            class="delete-custom-view__button"
+            @click="onClickOpenDeleteCustomViewsModal"
+          />
+        </div>
+
         <woot-button
-          v-if="!hasActiveCustomViews"
+          v-else
           v-tooltip.top-end="$t('FILTER.TOOLTIP_LABEL')"
           variant="clear"
           color-scheme="secondary"
@@ -52,6 +64,14 @@
       @close="onCloseAddCustomViewsModal"
     />
 
+    <delete-custom-views
+      v-if="showDeleteCustomViewsModal"
+      :show-delete-popup.sync="showDeleteCustomViewsModal"
+      :active-custom-view="activeCustomView"
+      :custom-views-id="customViewsId"
+      @close="onCloseDeleteCustomViewsModal"
+    />
+
     <chat-type-tabs
       v-if="!hasAppliedFiltersOrActiveCustomViews"
       :items="assigneeTabItems"
@@ -129,6 +149,7 @@ import wootConstants from '../constants';
 import advancedFilterTypes from './widgets/conversation/advancedFilterItems';
 import filterQueryGenerator from '../helper/filterQueryGenerator.js';
 import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
+import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews.vue';
 
 import {
   hasPressedAltAndJKey,
@@ -142,6 +163,7 @@ export default {
     ConversationCard,
     ChatFilter,
     ConversationAdvancedFilter,
+    DeleteCustomViews,
   },
   mixins: [timeMixin, conversationMixin, eventListenerMixins],
   props: {
@@ -177,6 +199,7 @@ export default {
       })),
       customViewsQuery: {},
       showAddCustomViewsModal: false,
+      showDeleteCustomViewsModal: false,
     };
   },
   computed: {
@@ -197,14 +220,14 @@ export default {
       return this.appliedFilters.length;
     },
     hasActiveCustomViews() {
-      return this.activeCustomView.length > 0 && this.customViewsId !== 0;
+      return this.activeCustomView && this.customViewsId !== 0;
     },
     hasAppliedFiltersOrActiveCustomViews() {
       return this.hasAppliedFilters || this.hasActiveCustomViews;
     },
     savedCustomViewsValue() {
       if (this.hasActiveCustomViews) {
-        const payload = this.activeCustomView[0].query;
+        const payload = this.activeCustomView.query;
         this.fetchSavedFilteredConversations(payload);
       }
       return {};
@@ -275,7 +298,7 @@ export default {
         return this.$t('CHAT_LIST.MENTION_HEADING');
       }
       if (this.hasActiveCustomViews) {
-        return this.activeCustomView[0].name;
+        return this.activeCustomView.name;
       }
       return this.$t('CHAT_LIST.TAB_HEADING');
     },
@@ -298,11 +321,13 @@ export default {
     },
     activeCustomView() {
       if (this.customViewsId) {
-        return this.customViews.filter(
+        const activeView = this.customViews.filter(
           view => view.id === Number(this.customViewsId)
         );
+        const [firstValue] = activeView;
+        return firstValue;
       }
-      return [];
+      return undefined;
     },
     activeTeam() {
       if (this.teamId) {
@@ -352,6 +377,12 @@ export default {
     onCloseAddCustomViewsModal() {
       this.showAddCustomViewsModal = false;
     },
+    onClickOpenDeleteCustomViewsModal() {
+      this.showDeleteCustomViewsModal = true;
+    },
+    onCloseDeleteCustomViewsModal() {
+      this.showDeleteCustomViewsModal = false;
+    },
     onToggleAdvanceFiltersModal() {
       this.showAdvancedFilters = !this.showAdvancedFilters;
     },
@@ -404,7 +435,7 @@ export default {
       this.$store.dispatch('emptyAllConversations');
       this.$store.dispatch('clearConversationFilters');
       if (this.hasActiveCustomViews) {
-        const payload = this.activeCustomView[0].query;
+        const payload = this.activeCustomView.query;
         this.fetchSavedFilteredConversations(payload);
       }
       if (this.customViewsId) {
@@ -422,7 +453,7 @@ export default {
         this.fetchConversations();
       }
       if (this.hasActiveCustomViews) {
-        const payload = this.activeCustomView[0].query;
+        const payload = this.activeCustomView.query;
         this.fetchSavedFilteredConversations(payload);
       } else {
         this.fetchFilteredConversations(this.appliedFilters);
@@ -504,4 +535,8 @@ export default {
   padding: 0 0 var(--space-slab) 0 !important;
   border-bottom: 1px solid var(--color-border);
 }
+
+.delete-custom-view__button {
+  margin-right: var(--space-normal);
+}
 </style>
diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index 92a69f0b7..4dc077427 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -45,6 +45,21 @@
           "SUCCESS_MESSAGE": "Custom view created successfully",
           "ERROR_MESSAGE": "Error while creating custom view"
         }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirm Deletion",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Yes, Delete ",
+            "NO": "No, Keep "
+          }
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Custom view deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting custom view"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue b/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
new file mode 100644
index 000000000..979a7f9bb
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <woot-delete-modal
+      v-if="showDeletePopup"
+      :show.sync="showDeletePopup"
+      :on-close="closeDeletePopup"
+      :on-confirm="deleteSavedCustomViews"
+      :title="$t('FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.TITLE')"
+      :message="deleteMessage"
+      :confirm-text="deleteConfirmText"
+      :reject-text="deleteRejectText"
+    />
+  </div>
+</template>
+
+<script>
+import alertMixin from 'shared/mixins/alertMixin';
+export default {
+  mixins: [alertMixin],
+  props: {
+    showDeletePopup: {
+      type: Boolean,
+      default: false,
+    },
+    activeCustomView: {
+      type: Object,
+      default: () => {},
+    },
+    customViewsId: {
+      type: [String, Number],
+      default: 0,
+    },
+  },
+
+  computed: {
+    deleteMessage() {
+      return `${this.$t(
+        'FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.MESSAGE'
+      )} ${this.activeCustomView && this.activeCustomView.name} ?`;
+    },
+    deleteConfirmText() {
+      return `${this.$t('FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.YES')} ${this
+        .activeCustomView && this.activeCustomView.name}`;
+    },
+    deleteRejectText() {
+      return `${this.$t('FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.NO')} ${this
+        .activeCustomView && this.activeCustomView.name}`;
+    },
+  },
+
+  methods: {
+    async deleteSavedCustomViews() {
+      try {
+        await this.$store.dispatch(
+          'customViews/delete',
+          Number(this.customViewsId)
+        );
+        this.closeDeletePopup();
+        this.showAlert(
+          this.$t('FILTER.CUSTOM_VIEWS.DELETE.API.SUCCESS_MESSAGE')
+        );
+      } catch (error) {
+        const errorMessage =
+          error?.response?.message ||
+          this.$t('FILTER.CUSTOM_VIEWS.DELETE.API.ERROR_MESSAGE');
+        this.showAlert(errorMessage);
+      }
+      if (this.$route.name !== 'home') {
+        this.$router.push({ name: 'home' });
+      }
+    },
+    closeDeletePopup() {
+      this.$emit('close');
+    },
+  },
+};
+</script>

From 241e7d0c293dc5f6339e0fe1ddae289defaa9c3b Mon Sep 17 00:00:00 2001
From: Sanju <sanjusdhr@gmail.com>
Date: Wed, 19 Jan 2022 11:26:52 +0530
Subject: [PATCH 017/101] Enhancement: Add background color to draggable blocks
 in the sidebar (#3778)

* add background

* update background color in contact info

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/contacts/components/ContactInfoPanel.vue      | 6 ++++++
 .../routes/dashboard/conversation/ContactPanel.vue          | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index 7f3c449a8..985179d83 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -159,6 +159,12 @@ export default {
   border-right: 1px solid var(--color-border);
 }
 
+.list-group {
+  .list-group-item {
+    background-color: var(--white);
+  }
+}
+
 .close-button {
   position: absolute;
   right: var(--space-normal);
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index e5510fd99..294f2b6ba 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -236,6 +236,12 @@ export default {
   }
 }
 
+.list-group {
+  .list-group-item {
+    background-color: var(--white);
+  }
+}
+
 ::v-deep {
   .contact--profile {
     padding-bottom: var(--space-slab);

From 1b36143d27e65d37502ec133a712a8bddc0da581 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 19 Jan 2022 12:43:04 +0530
Subject: [PATCH 018/101] fix: Fixes alignment of widget unread view close
 button (#3806)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/widget/components/UnreadMessageList.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/javascript/widget/components/UnreadMessageList.vue b/app/javascript/widget/components/UnreadMessageList.vue
index a3368d4e9..6d8005ef1 100644
--- a/app/javascript/widget/components/UnreadMessageList.vue
+++ b/app/javascript/widget/components/UnreadMessageList.vue
@@ -135,9 +135,5 @@ export default {
       color: $color-body;
     }
   }
-
-  .close-unread-wrap {
-    text-align: left;
-  }
 }
 </style>

From 9617137688d30a4a84b089affe8d85332671bfd6 Mon Sep 17 00:00:00 2001
From: Shivam Chahar <chahar.shivam@yahoo.com>
Date: Wed, 19 Jan 2022 13:16:21 +0530
Subject: [PATCH 019/101] chore: Account auto resolution time validation
 (#3651)

---
 app/javascript/dashboard/i18n/locale/bg/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/en/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/hi/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/it/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/ja/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/ml/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/ne/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/nl/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/ta/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/th/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/uk/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/vi/generalSettings.json   | 2 +-
 app/javascript/dashboard/i18n/locale/zh/generalSettings.json   | 2 +-
 .../dashboard/i18n/locale/zh_TW/generalSettings.json           | 2 +-
 .../dashboard/routes/dashboard/settings/account/Index.vue      | 3 ++-
 app/models/account.rb                                          | 2 +-
 spec/models/account_spec.rb                                    | 1 +
 17 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index c7f3e5cda..be2f72cac 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index a31f0fb90..f365a3248 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index b03100706..8a8997df6 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index b1632b12e..cff9cd9eb 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 8aca7cb34..0e5a1a931 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "あなたのアカウントでは、メールでの会話が継続できるようになっています。",
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 446de9251..1e6a7d6a3 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "പ്രവർത്തനമൊന്നുമില്ലെങ്കിൽ ടിക്കറ്റിന് ശേഷമുള്ള ദിവസങ്ങളുടെ എണ്ണം യാന്ത്രികമായി പരിഹരിക്കേണ്ടതാണ്",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "നിങ്ങളുടെ അക്കൗണ്ടിനായി ഇമെയിലുകളുമായുള്ള സംഭാഷണ തുടർച്ച പ്രവർത്തനക്ഷമമാക്കി.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index b03100706..8a8997df6 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 8745b0739..36dcbb1ac 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index a3f1cd537..21dba0a79 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 7f7640ab9..eb3621893 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "การสนทนาด้วยอีเมล์ถูกเปิดสำหรับบัญชีของคุณ",
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index f8fec2e24..1156ffd53 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index 3bff345e7..af30a871f 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Tính liên tục của cuộc trò chuyện với email được kích hoạt cho tài khoản của bạn.",
diff --git a/app/javascript/dashboard/i18n/locale/zh/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
index a1333ebe4..b6f30c288 100644
--- a/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index 1c8513747..7bda0926e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帳戶啟用了電子信箱與對話的持續性功能。",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 08c57a0c4..37639d9f8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -116,7 +116,7 @@
 </template>
 
 <script>
-import { required, minValue } from 'vuelidate/lib/validators';
+import { required, minValue, maxValue } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import configMixin from 'shared/mixins/configMixin';
@@ -146,6 +146,7 @@ export default {
     },
     autoResolveDuration: {
       minValue: minValue(1),
+      maxValue: maxValue(999),
     },
   },
   computed: {
diff --git a/app/models/account.rb b/app/models/account.rb
index c905265a9..140cef072 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -32,7 +32,7 @@ class Account < ApplicationRecord
   }.freeze
 
   validates :name, presence: true
-  validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, allow_nil: true }
+  validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 999, allow_nil: true }
 
   has_many :account_users, dependent: :destroy_async
   has_many :agent_bot_inboxes, dependent: :destroy_async
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 03d8c8937..fc3787ab4 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -5,6 +5,7 @@ require 'rails_helper'
 RSpec.describe Account do
   it { is_expected.to validate_presence_of(:name) }
   it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_greater_than_or_equal_to(1) }
+  it { is_expected.to validate_numericality_of(:auto_resolve_duration).is_less_than_or_equal_to(999) }
 
   it { is_expected.to have_many(:users).through(:account_users) }
   it { is_expected.to have_many(:account_users) }

From ab864a86fdcc772f8bb0bb20a52d5d3a08374e95 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 19 Jan 2022 22:20:04 -0800
Subject: [PATCH 020/101] fix: File and emoji pickers are disabled by default
 (#3803)

File and emoji pickers should be enabled by default.

Fixes: #3560

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/store/modules/inboxes.js          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 83102ba97..e266887f7 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -12,13 +12,16 @@ const buildInboxData = inboxParams => {
   Object.keys(inboxProperties).forEach(key => {
     formData.append(key, inboxProperties[key]);
   });
-  const { selectedFeatureFlags = [], ...channelParams } = channel;
-  if (selectedFeatureFlags.length) {
-    selectedFeatureFlags.forEach(featureFlag => {
-      formData.append(`channel[selected_feature_flags][]`, featureFlag);
-    });
-  } else {
-    formData.append('channel[selected_feature_flags][]', '');
+  const { selectedFeatureFlags, ...channelParams } = channel;
+  // selectedFeatureFlags needs to be empty when creating a website channel
+  if (selectedFeatureFlags) {
+    if (selectedFeatureFlags.length) {
+      selectedFeatureFlags.forEach(featureFlag => {
+        formData.append(`channel[selected_feature_flags][]`, featureFlag);
+      });
+    } else {
+      formData.append('channel[selected_feature_flags][]', '');
+    }
   }
   Object.keys(channelParams).forEach(key => {
     formData.append(`channel[${key}]`, channel[key]);

From a7c947aeae42d5a0df7846d408a3fea702ac5be3 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 21 Jan 2022 05:00:21 +0530
Subject: [PATCH 021/101] feat: Clone and update automation rules (#3782)

- endpoints to clone and update automation rules

fixes: #3740
---
 .../accounts/automation_rules_controller.rb   |  25 ++++-
 app/listeners/automation_rule_listener.rb     |   2 +-
 app/policies/automation_rule_policy.rb        |  16 +++
 .../automation_rules/clone.json.jbuilder      |   3 +
 .../automation_rules/show.json.jbuilder       |   3 +
 .../automation_rules/update.json.jbuilder     |   3 +
 config/routes.rb                              |   4 +-
 lib/filters/filter_keys.json                  |   2 +-
 .../automation_rules_controller_spec.rb       | 104 ++++++++++++++++++
 9 files changed, 158 insertions(+), 4 deletions(-)
 create mode 100644 app/views/api/v1/accounts/automation_rules/clone.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/automation_rules/show.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/automation_rules/update.json.jbuilder

diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index 723e587e6..12b7b5957 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -1,5 +1,6 @@
 class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseController
   before_action :check_authorization
+  before_action :fetch_automation_rule, only: [:show, :update, :destroy, :clone]
 
   def index
     @automation_rules = Current.account.automation_rules.active
@@ -9,13 +10,35 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
     @automation_rule = Current.account.automation_rules.create(automation_rules_permit)
   end
 
+  def show; end
+
+  def update
+    @automation_rule.update(automation_rules_permit)
+  end
+
+  def destroy
+    @automation_rule.destroy!
+    head :ok
+  end
+
+  def clone
+    automation_rule = Current.account.automation_rules.find_by(id: params[:automation_rule_id])
+    new_rule = automation_rule.dup
+    new_rule.save
+    @automation_rule = new_rule
+  end
+
   private
 
   def automation_rules_permit
     params.permit(
       :name, :description, :event_name, :account_id,
       conditions: [:attribute_key, :filter_operator, :query_operator, { values: [] }],
-      actions: [:action_name, { action_params: [:intiated_at] }]
+      actions: [:action_name, { action_params: [] }]
     )
   end
+
+  def fetch_automation_rule
+    @automation_rule = Current.account.automation_rules.find_by(id: params[:id])
+  end
 end
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 7b64a0b3a..cfd97e560 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -20,8 +20,8 @@ class AutomationRuleListener < BaseListener
   end
 
   def message_created(event_obj)
-    conversation = event_obj.data[:conversation]
     message = event_obj.data[:message]
+    conversation = message.conversation
     return unless rule_present?('message_created', conversation)
 
     @rules.each do |rule|
diff --git a/app/policies/automation_rule_policy.rb b/app/policies/automation_rule_policy.rb
index bd644f075..431b32964 100644
--- a/app/policies/automation_rule_policy.rb
+++ b/app/policies/automation_rule_policy.rb
@@ -6,4 +6,20 @@ class AutomationRulePolicy < ApplicationPolicy
   def create?
     @account_user.administrator?
   end
+
+  def show?
+    @account_user.administrator?
+  end
+
+  def update?
+    @account_user.administrator?
+  end
+
+  def clone?
+    @account_user.administrator?
+  end
+
+  def destroy?
+    @account_user.administrator?
+  end
 end
diff --git a/app/views/api/v1/accounts/automation_rules/clone.json.jbuilder b/app/views/api/v1/accounts/automation_rules/clone.json.jbuilder
new file mode 100644
index 000000000..1a6c02187
--- /dev/null
+++ b/app/views/api/v1/accounts/automation_rules/clone.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: @automation_rule
+end
diff --git a/app/views/api/v1/accounts/automation_rules/show.json.jbuilder b/app/views/api/v1/accounts/automation_rules/show.json.jbuilder
new file mode 100644
index 000000000..1a6c02187
--- /dev/null
+++ b/app/views/api/v1/accounts/automation_rules/show.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: @automation_rule
+end
diff --git a/app/views/api/v1/accounts/automation_rules/update.json.jbuilder b/app/views/api/v1/accounts/automation_rules/update.json.jbuilder
new file mode 100644
index 000000000..1a6c02187
--- /dev/null
+++ b/app/views/api/v1/accounts/automation_rules/update.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: @automation_rule
+end
diff --git a/config/routes.rb b/config/routes.rb
index 493810c03..aaf0330ea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -52,7 +52,9 @@ Rails.application.routes.draw do
             end
           end
           resources :canned_responses, except: [:show, :edit, :new]
-          resources :automation_rules, only: [:create, :index]
+          resources :automation_rules, except: [:edit] do
+            post :clone
+          end
           resources :campaigns, only: [:index, :create, :show, :update, :destroy]
 
           namespace :channels do
diff --git a/lib/filters/filter_keys.json b/lib/filters/filter_keys.json
index a34dad067..2aa5fdab1 100644
--- a/lib/filters/filter_keys.json
+++ b/lib/filters/filter_keys.json
@@ -145,7 +145,7 @@
       "attribute_type": "standard"
     },
     "content": {
-      "attribute_name": "Message Type",
+      "attribute_name": "Message Content",
       "input_type": "search_box with name tags/plain text",
       "data_type": "text",
       "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index dda022839..5755bf95a 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -115,4 +115,108 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
       end
     end
   end
+
+  describe 'GET /api/v1/accounts/{account.id}/automation_rules/{automation_rule.id}' do
+    let!(:automation_rule) { create(:automation_rule, account: account, name: 'Test Automation Rule') }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns for automation_rule for account' do
+        expect(account.automation_rules.count).to eq(1)
+
+        get "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}",
+            headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body, symbolize_names: true)
+        expect(body[:payload]).to be_present
+        expect(body[:payload][:id]).to eq(automation_rule.id)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/automation_rules/{automation_rule.id}/clone' do
+    let!(:automation_rule) { create(:automation_rule, account: account, name: 'Test Automation Rule') }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}/clone"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns for cloned automation_rule for account' do
+        expect(account.automation_rules.count).to eq(1)
+
+        post "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}/clone",
+             headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body, symbolize_names: true)
+        expect(body[:payload]).to be_present
+        expect(body[:payload][:id]).not_to eq(automation_rule.id)
+        expect(account.automation_rules.count).to eq(2)
+      end
+    end
+  end
+
+  describe 'PATCH /api/v1/accounts/{account.id}/automation_rules/{automation_rule.id}' do
+    let!(:automation_rule) { create(:automation_rule, account: account, name: 'Test Automation Rule') }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        patch "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns for cloned automation_rule for account' do
+        params = { name: 'Update name' }
+        expect(account.automation_rules.count).to eq(1)
+
+        patch "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}",
+              headers: administrator.create_new_auth_token,
+              params: params
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body, symbolize_names: true)
+        expect(body[:payload][:name]).to eq('Update name')
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/accounts/{account.id}/automation_rules/{automation_rule.id}' do
+    let!(:automation_rule) { create(:automation_rule, account: account, name: 'Test Automation Rule') }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'delete the automation_rule for account' do
+        expect(account.automation_rules.count).to eq(1)
+
+        delete "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}",
+               headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        expect(account.automation_rules.count).to eq(0)
+      end
+    end
+  end
 end

From e997aaceb7d7c1294bb8376bf8f7049c3b7d2cbd Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 21 Jan 2022 05:25:35 +0530
Subject: [PATCH 022/101] Fix: Email Parsing for html fix (#3659)

---
 app/presenters/mail_presenter.rb        | 55 ++++++++++++++-----------
 spec/fixtures/files/mail_with_quote.eml |  6 +--
 spec/mailboxes/reply_mailbox_spec.rb    | 52 +++++++++++++++++++++++
 3 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index cc062b1c9..542004595 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -8,30 +8,49 @@ class MailPresenter < SimpleDelegator
   end
 
   def subject
-    encode_to_unicode(@mail.subject || '')
+    encode_to_unicode(@mail.subject)
   end
 
   def text_content
-    @decoded_text_content ||= encode_to_unicode(text_part&.decoded || decoded_message || '')
+    @decoded_text_content = select_body(text_part) || ''
+    encoding = @decoded_text_content.encoding
+
+    body = EmailReplyTrimmer.trim(@decoded_text_content)
 
     return {} if @decoded_text_content.blank?
 
     @text_content ||= {
-      full: @decoded_text_content,
-      reply: extract_reply(@decoded_text_content)[:reply],
-      quoted: extract_reply(@decoded_text_content)[:quoted_text]
+      full: select_body(text_part),
+      reply: @decoded_text_content,
+      quoted: body.force_encoding(encoding).encode('UTF-8')
     }
   end
 
+  # returns encoded mail body text_part if available.
+  # else returns parsed the html body if contains text/html content.
+  def select_body(mail_part)
+    return '' unless mail_part
+
+    decoded = encode_to_unicode(mail_part.decoded)
+
+    if mail.text_part
+      decoded
+    elsif (mail.content_type || '').include? 'text/html'
+      ::HtmlParser.parse_reply(decoded)
+    end
+  end
+
   def html_content
-    @decoded_html_content ||= encode_to_unicode(html_part&.decoded)
+    @decoded_html_content = select_body(html_part) || ''
 
     return {} if @decoded_html_content.blank?
 
+    body = EmailReplyTrimmer.trim(@decoded_html_content)
+
     @html_content ||= {
-      full: @decoded_html_content,
-      reply: extract_reply(@decoded_html_content)[:reply],
-      quoted: extract_reply(@decoded_html_content)[:quoted_text]
+      full: select_body(html_part),
+      reply: @decoded_html_content,
+      quoted: body
     }
   end
 
@@ -47,14 +66,6 @@ class MailPresenter < SimpleDelegator
     end
   end
 
-  def decoded_message
-    if mail.multipart?
-      return mail.text_part ? mail.text_part.decoded : nil
-    end
-
-    mail.decoded
-  end
-
   def number_of_attachments
     mail.attachments.count
   end
@@ -114,13 +125,7 @@ class MailPresenter < SimpleDelegator
     return str if current_encoding == 'UTF-8'
 
     str.encode(current_encoding, 'UTF-8', invalid: :replace, undef: :replace, replace: '?')
-  end
-
-  def extract_reply(content)
-    # NOTE: implement the reply parser over here
-    {
-      reply: content.strip,
-      quoted_text: content.strip
-    }
+  rescue StandardError
+    ''
   end
 end
diff --git a/spec/fixtures/files/mail_with_quote.eml b/spec/fixtures/files/mail_with_quote.eml
index 2019dd692..4e7266fcb 100644
--- a/spec/fixtures/files/mail_with_quote.eml
+++ b/spec/fixtures/files/mail_with_quote.eml
@@ -30,14 +30,14 @@ Content-Type: text/html; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr">Yes, I am providing you step how to reproduce this issue</=
-div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On=
+div><br>class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On=
  Thu, Aug 19, 2021 at 2:07 PM Tejaswini from Email sender test &l=
 t;<a href=3D"mailto:tejaswini@chatwoot.com">tejaswini@chatwoot.com</a>&gt; wrot=
 e:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0=
 .8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">  <p>
-      </p><p>Any update on this?</p>
+      </p>Any update on this?</p>
 
-  <p></p>
+  <p>
 </blockquote></div><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr"=
  class=3D"gmail_signature"><div dir=3D"ltr"><div><div dir=3D"ltr"><div><div=
 ><b>Sony Mathew.</b><br></div><span style=3D"font-family:&quot;times ne=
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index 4a9b707f9..bef8e22a9 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -96,5 +96,57 @@ RSpec.describe ReplyMailbox, type: :mailbox do
         expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
       end
     end
+
+    context 'with quotes in email' do
+      let(:described_subject) { described_class.receive mail_with_quote }
+
+      before do
+        # this UUID is hardcoded in the reply.eml, that's why we are updating this
+        conversation.uuid = '6bdc3f4d-0bec-4515-a284-5d916fdde489'
+        conversation.save
+      end
+
+      it 'add the mail content as new message on the conversation' do
+        described_subject
+        current_message = conversation.messages.last
+        expect(current_message.content).to eq(
+          <<-BODY.strip_heredoc.chomp
+            Yes, I am providing you step how to reproduce this issue
+
+            On Thu, Aug 19, 2021 at 2:07 PM Tejaswini from Email sender test < tejaswini@chatwoot.com> wrote:
+
+            > Any update on this?
+            >
+            >
+
+            --
+            * Sony Mathew*
+            Software developer
+            *Mob:9999999999
+          BODY
+        )
+      end
+
+      it 'add the mail content as new message on the conversation with broken html' do
+        described_subject
+        current_message = conversation.messages.last
+        expect(current_message.reload.content_attributes[:email][:text_content][:reply]).to eq(
+          <<-BODY.strip_heredoc.chomp
+            Yes, I am providing you step how to reproduce this issue
+
+            On Thu, Aug 19, 2021 at 2:07 PM Tejaswini from Email sender test < tejaswini@chatwoot.com> wrote:
+
+            > Any update on this?
+            >
+            >
+
+            --
+            * Sony Mathew*
+            Software developer
+            *Mob:9999999999
+          BODY
+        )
+      end
+    end
   end
 end

From 693f2531ab556873a9565b2426e2236f450c71f9 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 20 Jan 2022 17:09:30 -0800
Subject: [PATCH 023/101] feat: Support 360Dialog Interactive Templates 
 (#3823)

fixes: #3795
---
 .../whatsapp/incoming_message_service.rb       |  3 ++-
 .../whatsapp/incoming_message_service_spec.rb  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/services/whatsapp/incoming_message_service.rb b/app/services/whatsapp/incoming_message_service.rb
index a10d40797..78d7ae28d 100644
--- a/app/services/whatsapp/incoming_message_service.rb
+++ b/app/services/whatsapp/incoming_message_service.rb
@@ -29,6 +29,7 @@ class Whatsapp::IncomingMessageService
   def message_content(message)
     # TODO: map interactive messages back to button messages in chatwoot
     message.dig(:text, :body) ||
+      message.dig(:button, :text) ||
       message.dig(:interactive, :button_reply, :title) ||
       message.dig(:interactive, :list_reply, :title)
   end
@@ -77,7 +78,7 @@ class Whatsapp::IncomingMessageService
 
   def attach_files
     message_type = params[:messages].first[:type]
-    return if %w[text interactive].include?(message_type)
+    return if %w[text button interactive].include?(message_type)
 
     attachment_payload = params[:messages].first[message_type.to_sym]
     attachment_file = Down.download(inbox.channel.media_url(attachment_payload[:id]), headers: inbox.channel.api_headers)
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index 2c2b587b3..0144dd169 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -43,6 +43,24 @@ describe Whatsapp::IncomingMessageService do
       end
     end
 
+    # ref: https://github.com/chatwoot/chatwoot/issues/3795#issuecomment-1018057318
+    context 'when valid template button message params' do
+      it 'creates appropriate conversations, message and contacts' do
+        params = {
+          'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
+          'messages' => [{ 'from' => '2423423243', 'id' => 'SDFADSf23sfasdafasdfa',
+                           'button' => {
+                             'text' => 'Yes this is a button'
+                           },
+                           'timestamp' => '1633034394', 'type' => 'button' }]
+        }.with_indifferent_access
+        described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
+        expect(whatsapp_channel.inbox.conversations.count).not_to eq(0)
+        expect(Contact.all.first.name).to eq('Sojan Jose')
+        expect(whatsapp_channel.inbox.messages.first.content).to eq('Yes this is a button')
+      end
+    end
+
     context 'when valid attachment message params' do
       it 'creates appropriate conversations, message and contacts' do
         stub_request(:get, whatsapp_channel.media_url('b1c68f38-8734-4ad3-b4a1-ef0c10d683')).to_return(

From 504fc24fb34d6943854135f8455a9de0faeefd13 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Sat, 22 Jan 2022 03:41:59 +0530
Subject: [PATCH 024/101] feat: Add the ability to save filters for contact
 (#3791)

---
 app/javascript/dashboard/api/customViews.js   |  4 +-
 .../dashboard/components/layout/Sidebar.vue   | 34 ++++++++-
 .../layout/config/sidebarItems/contacts.js    |  1 +
 .../layout/sidebarComponents/Secondary.vue    | 32 ++++++++-
 .../dashboard/i18n/locale/en/contact.json     |  1 +
 .../dashboard/i18n/locale/en/settings.json    |  3 +-
 .../contacts/components/ContactsView.vue      | 69 ++++++++++++++++++-
 .../dashboard/contacts/components/Header.vue  | 26 ++++++-
 .../routes/dashboard/contacts/routes.js       |  9 +++
 .../dashboard/store/modules/customViews.js    |  9 ++-
 .../modules/specs/customViews/fixtures.js     | 16 ++---
 .../modules/specs/customViews/getters.spec.js | 30 +++++---
 12 files changed, 203 insertions(+), 31 deletions(-)

diff --git a/app/javascript/dashboard/api/customViews.js b/app/javascript/dashboard/api/customViews.js
index bb09047ba..03bb9dee8 100644
--- a/app/javascript/dashboard/api/customViews.js
+++ b/app/javascript/dashboard/api/customViews.js
@@ -6,8 +6,8 @@ class CustomViewsAPI extends ApiClient {
     super('custom_filters', { accountScoped: true });
   }
 
-  getCustomViews() {
-    return axios.get(this.url);
+  getCustomViewsByFilterType(type) {
+    return axios.get(`${this.url}?filter_type=${type}`);
   }
 }
 
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 448603c6f..ee64f4949 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -88,12 +88,31 @@ export default {
       currentUser: 'getCurrentUser',
       globalConfig: 'globalConfig/get',
       inboxes: 'inboxes/getInboxes',
-      customViews: 'customViews/getCustomViews',
       accountId: 'getCurrentAccountId',
       currentRole: 'getCurrentRole',
       labels: 'labels/getLabelsOnSidebar',
       teams: 'teams/getMyTeams',
     }),
+    activeCustomView() {
+      if (this.activePrimaryMenu.key === 'contacts') {
+        return 'contact';
+      }
+      if (this.activePrimaryMenu.key === 'conversations') {
+        return 'conversation';
+      }
+      return '';
+    },
+    customViews() {
+      return this.$store.getters['customViews/getCustomViewsByFilterType'](
+        this.activeCustomView
+      );
+    },
+    isConversationOrContactActive() {
+      return (
+        this.activePrimaryMenu.key === 'contacts' ||
+        this.activePrimaryMenu.key === 'conversations'
+      );
+    },
     sideMenuConfig() {
       return getSidebarItems(this.accountId);
     },
@@ -121,16 +140,27 @@ export default {
       return activePrimaryMenu;
     },
   },
+
+  watch: {
+    activeCustomView() {
+      this.fetchCustomViews();
+    },
+  },
   mounted() {
     this.$store.dispatch('labels/get');
     this.$store.dispatch('inboxes/get');
-    this.$store.dispatch('customViews/get');
     this.$store.dispatch('notifications/unReadCount');
     this.$store.dispatch('teams/get');
     this.$store.dispatch('attributes/get');
+    this.fetchCustomViews();
   },
 
   methods: {
+    fetchCustomViews() {
+      if (this.isConversationOrContactActive) {
+        this.$store.dispatch('customViews/get', this.activeCustomView);
+      }
+    },
     toggleKeyShortcutModal() {
       this.showShortcutModal = true;
     },
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js b/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
index 0729abcfe..723b3fbdf 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
@@ -5,6 +5,7 @@ const contacts = accountId => ({
   routes: [
     'contacts_dashboard',
     'contact_profile_dashboard',
+    'contacts_through_custom_view',
     'contacts_labels_dashboard',
   ],
   menuItems: [
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 72f559fc1..9c41f9946 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -57,6 +57,9 @@ export default {
     hasSecondaryMenu() {
       return this.menuConfig.menuItems && this.menuConfig.menuItems.length;
     },
+    contactCustomViews() {
+      return this.customViews.filter(view => view.filter_type === 'contact');
+    },
     accessibleMenuItems() {
       if (!this.currentRole) {
         return [];
@@ -157,7 +160,7 @@ export default {
     customViewsSection() {
       return {
         icon: 'folder',
-        label: 'CUSTOM_VIEWS',
+        label: 'CUSTOM_VIEWS_FOLDER',
         hasSubMenu: true,
         key: 'custom_view',
         children: this.customViews
@@ -172,8 +175,27 @@ export default {
           })),
       };
     },
+    contactCustomViewsSection() {
+      return {
+        icon: 'folder',
+        label: 'CUSTOM_VIEWS_SEGMENTS',
+        hasSubMenu: true,
+        key: 'custom_view',
+        children: this.customViews
+          .filter(view => view.filter_type === 'contact')
+          .map(view => ({
+            id: view.id,
+            label: view.name,
+            truncateLabel: true,
+            toState: frontendURL(
+              `accounts/${this.accountId}/contacts/custom_view/${view.id}`
+            ),
+          })),
+      };
+    },
     additionalSecondaryMenuItems() {
       let conversationMenuItems = [this.inboxSection, this.labelSection];
+      let contactMenuItems = [this.contactLabelSection];
       if (this.teams.length) {
         conversationMenuItems = [this.teamSection, ...conversationMenuItems];
       }
@@ -183,9 +205,15 @@ export default {
           ...conversationMenuItems,
         ];
       }
+      if (this.contactCustomViews.length) {
+        contactMenuItems = [
+          this.contactCustomViewsSection,
+          ...contactMenuItems,
+        ];
+      }
       return {
         conversations: conversationMenuItems,
-        contacts: [this.contactLabelSection],
+        contacts: contactMenuItems,
       };
     },
   },
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 976f4c53e..76e47697c 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -179,6 +179,7 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index ceacb2486..f46b6e2e7 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -149,7 +149,8 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
-    "CUSTOM_VIEWS": "Folders",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index 1c7489e71..6ca94b3cf 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -3,13 +3,15 @@
     <div class="left-wrap" :class="wrapClas">
       <contacts-header
         :search-query="searchQuery"
+        :custom-views-id="customViewsId"
         :on-search-submit="onSearchSubmit"
         this-selected-contact-id=""
         :on-input-search="onInputSearch"
         :on-toggle-create="onToggleCreate"
         :on-toggle-import="onToggleImport"
         :on-toggle-filter="onToggleFilters"
-        :header-title="label"
+        :header-title="pageTitle"
+        @on-toggle-save-filter="onToggleSaveFilters"
       />
       <contacts-table
         :contacts="records"
@@ -26,6 +28,12 @@
         :total-count="meta.count"
       />
     </div>
+    <add-custom-views
+      v-if="showAddCustomViewsModal"
+      :custom-views-query="customViewsQuery"
+      :filter-type="filterType"
+      @close="onCloseAddCustomViewsModal"
+    />
     <contact-info-panel
       v-if="showContactViewPane"
       :contact="selectedContact"
@@ -63,8 +71,10 @@ import ImportContacts from './ImportContacts.vue';
 import ContactsAdvancedFilters from './ContactsAdvancedFilters.vue';
 import contactFilterItems from '../contactFilterItems';
 import filterQueryGenerator from '../../../../helper/filterQueryGenerator';
+import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
 
 const DEFAULT_PAGE = 1;
+const FILTER_TYPE_CONTACT = 1;
 
 export default {
   components: {
@@ -75,9 +85,14 @@ export default {
     CreateContact,
     ImportContacts,
     ContactsAdvancedFilters,
+    AddCustomViews,
   },
   props: {
     label: { type: String, default: '' },
+    customViewsId: {
+      type: [String, Number],
+      default: 0,
+    },
   },
   data() {
     return {
@@ -93,6 +108,9 @@ export default {
           `CONTACTS_FILTER.ATTRIBUTES.${filter.attributeI18nKey}`
         ),
       })),
+      customViewsQuery: {},
+      filterType: FILTER_TYPE_CONTACT,
+      showAddCustomViewsModal: false,
     };
   },
   computed: {
@@ -100,11 +118,28 @@ export default {
       records: 'contacts/getContacts',
       uiFlags: 'contacts/getUIFlags',
       meta: 'contacts/getMeta',
+      customViews: 'customViews/getCustomViews',
+      getAppliedContactFilters: 'contacts/getAppliedContactFilters',
     }),
     showEmptySearchResult() {
       const hasEmptyResults = !!this.searchQuery && this.records.length === 0;
       return hasEmptyResults;
     },
+    hasAppliedFilters() {
+      return this.getAppliedContactFilters.length;
+    },
+    hasActiveCustomViews() {
+      return this.activeCustomView && this.customViewsId !== 0;
+    },
+    pageTitle() {
+      if (this.hasActiveCustomViews) {
+        return this.activeCustomView.name;
+      }
+      if (this.label) {
+        return `#${this.label}`;
+      }
+      return this.$t('CONTACTS_PAGE.HEADER');
+    },
     selectedContact() {
       if (this.selectedContactId) {
         const contact = this.records.find(
@@ -127,11 +162,28 @@ export default {
         ? selectedPageNumber
         : DEFAULT_PAGE;
     },
+    activeCustomView() {
+      if (this.customViewsId) {
+        const [firstValue] = this.customViews.filter(
+          view => view.id === Number(this.customViewsId)
+        );
+        return firstValue;
+      }
+      return undefined;
+    },
   },
   watch: {
     label() {
       this.fetchContacts(DEFAULT_PAGE);
     },
+    activeCustomView() {
+      if (this.hasActiveCustomViews) {
+        const payload = this.activeCustomView.query;
+        this.fetchSavedFilteredContact(payload);
+      } else {
+        this.fetchContacts(DEFAULT_PAGE);
+      }
+    },
   },
   mounted() {
     this.fetchContacts(this.pageParameter);
@@ -177,6 +229,14 @@ export default {
         });
       }
     },
+    fetchSavedFilteredContact(payload) {
+      if (this.hasAppliedFilters) {
+        this.clearFilters();
+      }
+      this.$store.dispatch('contacts/filter', {
+        queryPayload: payload,
+      });
+    },
     onInputSearch(event) {
       const newQuery = event.target.value;
       const refetchAllContacts = !!this.searchQuery && newQuery === '';
@@ -206,6 +266,12 @@ export default {
     onToggleCreate() {
       this.showCreateModal = !this.showCreateModal;
     },
+    onToggleSaveFilters() {
+      this.showAddCustomViewsModal = true;
+    },
+    onCloseAddCustomViewsModal() {
+      this.showAddCustomViewsModal = false;
+    },
     onToggleImport() {
       this.showImportModal = !this.showImportModal;
     },
@@ -218,6 +284,7 @@ export default {
     },
     onApplyFilter(payload) {
       this.closeContactInfoPanel();
+      this.customViewsQuery = { payload };
       this.$store.dispatch('contacts/filter', {
         queryPayload: filterQueryGenerator(payload),
       });
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 2758da76d..8d2ddc848 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -3,7 +3,7 @@
     <div class="table-actions-wrap">
       <div class="left-aligned-wrap">
         <h1 class="page-title">
-          {{ headerTitle ? `#${headerTitle}` : $t('CONTACTS_PAGE.HEADER') }}
+          {{ headerTitle }}
         </h1>
       </div>
       <div class="right-aligned-wrap">
@@ -26,7 +26,7 @@
             {{ $t('CONTACTS_PAGE.SEARCH_BUTTON') }}
           </woot-button>
         </div>
-        <div class="filters__button-wrap">
+        <div v-if="!hasActiveCustomViews" class="filters__button-wrap">
           <div v-if="hasAppliedFilters" class="filters__applied-indicator" />
           <woot-button
             class="margin-right-small clear"
@@ -38,6 +38,16 @@
             {{ $t('CONTACTS_PAGE.FILTER_CONTACTS') }}
           </woot-button>
         </div>
+        <woot-button
+          v-if="hasAppliedFilters && !hasActiveCustomViews"
+          class="margin-right-small clear"
+          color-scheme="alert"
+          variant="clear"
+          icon="save"
+          @click="onToggleCustomViewsModal"
+        >
+          {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_SAVE') }}
+        </woot-button>
         <woot-button
           class="margin-right-small clear"
           color-scheme="success"
@@ -74,6 +84,10 @@ export default {
       type: String,
       default: '',
     },
+    customViewsId: {
+      type: [String, Number],
+      default: 0,
+    },
     onInputSearch: {
       type: Function,
       default: () => {},
@@ -111,6 +125,14 @@ export default {
     hasAppliedFilters() {
       return this.getAppliedContactFilters.length;
     },
+    hasActiveCustomViews() {
+      return this.customViewsId !== 0;
+    },
+  },
+  methods: {
+    onToggleCustomViewsModal() {
+      this.$emit('on-toggle-save-filter');
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/routes.js b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
index 054b16d7c..0901489bf 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/routes.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
@@ -10,6 +10,15 @@ export const routes = [
     roles: ['administrator', 'agent'],
     component: ContactsView,
   },
+  {
+    path: frontendURL('accounts/:accountId/contacts/custom_view/:id'),
+    name: 'contacts_through_custom_view',
+    roles: ['administrator', 'agent'],
+    component: ContactsView,
+    props: route => {
+      return { customViewsId: route.params.id };
+    },
+  },
   {
     path: frontendURL('accounts/:accountId/labels/:label/contacts'),
     name: 'contacts_labels_dashboard',
diff --git a/app/javascript/dashboard/store/modules/customViews.js b/app/javascript/dashboard/store/modules/customViews.js
index f1c04f01c..252db4107 100644
--- a/app/javascript/dashboard/store/modules/customViews.js
+++ b/app/javascript/dashboard/store/modules/customViews.js
@@ -18,13 +18,18 @@ export const getters = {
   getCustomViews(_state) {
     return _state.records;
   },
+  getCustomViewsByFilterType: _state => filterType => {
+    return _state.records.filter(record => record.filter_type === filterType);
+  },
 };
 
 export const actions = {
-  get: async function getCustomViews({ commit }) {
+  get: async function getCustomViews({ commit }, filterType) {
     commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isFetching: true });
     try {
-      const response = await CustomViewsAPI.getCustomViews();
+      const response = await CustomViewsAPI.getCustomViewsByFilterType(
+        filterType
+      );
       commit(types.SET_CUSTOM_VIEW, response.data);
     } catch (error) {
       // Ignore error
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
index 54917a0b0..1a620add9 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/fixtures.js
@@ -1,7 +1,7 @@
 export default [
   {
     name: 'Custom view',
-    filter_type: 'conversation',
+    filter_type: 0,
     query: {
       payload: [
         {
@@ -21,20 +21,14 @@ export default [
   },
   {
     name: 'Custom view 1',
-    filter_type: 'conversation',
+    filter_type: 1,
     query: {
       payload: [
         {
-          attribute_key: 'browser_language',
+          attribute_key: 'name',
           filter_operator: 'equal_to',
-          values: ['eng'],
-          query_operator: 'or',
-        },
-        {
-          attribute_key: 'campaign_id',
-          filter_operator: 'equal_to',
-          values: [15],
-          query_operator: 'and',
+          values: ['john doe'],
+          query_operator: null,
         },
       ],
     },
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
index e71e8fd58..ec50a7d5d 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/getters.spec.js
@@ -7,7 +7,7 @@ describe('#getters', () => {
     expect(getters.getCustomViews(state)).toEqual([
       {
         name: 'Custom view',
-        filter_type: 'conversation',
+        filter_type: 0,
         query: {
           payload: [
             {
@@ -27,20 +27,34 @@ describe('#getters', () => {
       },
       {
         name: 'Custom view 1',
-        filter_type: 'conversation',
+        filter_type: 1,
         query: {
           payload: [
             {
-              attribute_key: 'browser_language',
+              attribute_key: 'name',
               filter_operator: 'equal_to',
-              values: ['eng'],
-              query_operator: 'or',
+              values: ['john doe'],
+              query_operator: null,
             },
+          ],
+        },
+      },
+    ]);
+  });
+
+  it('getCustomViewsByFilterType', () => {
+    const state = { records: customViewList };
+    expect(getters.getCustomViewsByFilterType(state)(1)).toEqual([
+      {
+        name: 'Custom view 1',
+        filter_type: 1,
+        query: {
+          payload: [
             {
-              attribute_key: 'campaign_id',
+              attribute_key: 'name',
               filter_operator: 'equal_to',
-              values: [15],
-              query_operator: 'and',
+              values: ['john doe'],
+              query_operator: null,
             },
           ],
         },

From e90d0646483b799495aab899d8cc617241ca87fa Mon Sep 17 00:00:00 2001
From: Prithvi Tharun <ptrithu8@gmail.com>
Date: Mon, 24 Jan 2022 16:03:37 +0530
Subject: [PATCH 025/101] fix: Fixes typo in documentation on sidebar

---
 app/javascript/dashboard/i18n/locale/en/teamsSettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/teamsSettings.json b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
index 98a8ad755..34d85384b 100644
--- a/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"

From b304f5a82679a279727b9dda78e3d19e784bbc25 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 24 Jan 2022 17:37:43 +0530
Subject: [PATCH 026/101] feat: Adds the ability to delete a segment (#3836)

* feat: Adds the ability to delete a segment

* Minor fixes

* Small changes
---
 app/javascript/dashboard/api/customViews.js   |  4 ++
 .../i18n/locale/en/advancedFilters.json       |  4 +-
 .../dashboard/i18n/locale/en/contact.json     |  1 +
 .../contacts/components/ContactsView.vue      | 20 ++++++++++
 .../dashboard/contacts/components/Header.vue  | 15 +++++++
 .../customviews/DeleteCustomViews.vue         | 39 ++++++++++++++-----
 .../dashboard/store/modules/customViews.js    |  4 +-
 .../modules/specs/customViews/actions.spec.js |  8 ++--
 8 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/app/javascript/dashboard/api/customViews.js b/app/javascript/dashboard/api/customViews.js
index 03bb9dee8..3fd4e12a7 100644
--- a/app/javascript/dashboard/api/customViews.js
+++ b/app/javascript/dashboard/api/customViews.js
@@ -9,6 +9,10 @@ class CustomViewsAPI extends ApiClient {
   getCustomViewsByFilterType(type) {
     return axios.get(`${this.url}?filter_type=${type}`);
   }
+
+  deleteCustomViews(id, type) {
+    return axios.delete(`${this.url}/${id}?filter_type=${type}`);
+  }
 }
 
 export default new CustomViewsAPI();
diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index 4dc077427..492c27620 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -52,8 +52,8 @@
           "CONFIRM": {
             "TITLE": "Confirm Deletion",
             "MESSAGE": "Are you sure to delete the filter ",
-            "YES": "Yes, Delete ",
-            "NO": "No, Keep "
+            "YES": "Yes, Delete",
+            "NO": "No, Keep it"
           }
         },
         "API": {
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 76e47697c..3824d9593 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -180,6 +180,7 @@
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
     "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index 6ca94b3cf..39bc16b08 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -12,6 +12,7 @@
         :on-toggle-filter="onToggleFilters"
         :header-title="pageTitle"
         @on-toggle-save-filter="onToggleSaveFilters"
+        @on-toggle-delete-filter="onToggleDeleteFilters"
       />
       <contacts-table
         :contacts="records"
@@ -28,12 +29,22 @@
         :total-count="meta.count"
       />
     </div>
+
     <add-custom-views
       v-if="showAddCustomViewsModal"
       :custom-views-query="customViewsQuery"
       :filter-type="filterType"
       @close="onCloseAddCustomViewsModal"
     />
+    <delete-custom-views
+      v-if="showDeleteCustomViewsModal"
+      :show-delete-popup.sync="showDeleteCustomViewsModal"
+      :active-custom-view="activeCustomView"
+      :custom-views-id="customViewsId"
+      :active-filter-type="filterType"
+      @close="onCloseDeleteCustomViewsModal"
+    />
+
     <contact-info-panel
       v-if="showContactViewPane"
       :contact="selectedContact"
@@ -72,6 +83,7 @@ import ContactsAdvancedFilters from './ContactsAdvancedFilters.vue';
 import contactFilterItems from '../contactFilterItems';
 import filterQueryGenerator from '../../../../helper/filterQueryGenerator';
 import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
+import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews';
 
 const DEFAULT_PAGE = 1;
 const FILTER_TYPE_CONTACT = 1;
@@ -86,6 +98,7 @@ export default {
     ImportContacts,
     ContactsAdvancedFilters,
     AddCustomViews,
+    DeleteCustomViews,
   },
   props: {
     label: { type: String, default: '' },
@@ -111,6 +124,7 @@ export default {
       customViewsQuery: {},
       filterType: FILTER_TYPE_CONTACT,
       showAddCustomViewsModal: false,
+      showDeleteCustomViewsModal: false,
     };
   },
   computed: {
@@ -272,6 +286,12 @@ export default {
     onCloseAddCustomViewsModal() {
       this.showAddCustomViewsModal = false;
     },
+    onToggleDeleteFilters() {
+      this.showDeleteCustomViewsModal = true;
+    },
+    onCloseDeleteCustomViewsModal() {
+      this.showDeleteCustomViewsModal = false;
+    },
     onToggleImport() {
       this.showImportModal = !this.showImportModal;
     },
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 8d2ddc848..3006f43ca 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -26,6 +26,17 @@
             {{ $t('CONTACTS_PAGE.SEARCH_BUTTON') }}
           </woot-button>
         </div>
+
+        <woot-button
+          v-if="hasActiveCustomViews && !hasAppliedFilters"
+          class="margin-right-small clear"
+          color-scheme="alert"
+          icon="delete"
+          @click="onToggleDeleteCustomViewsModal"
+        >
+          {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_DELETE') }}
+        </woot-button>
+
         <div v-if="!hasActiveCustomViews" class="filters__button-wrap">
           <div v-if="hasAppliedFilters" class="filters__applied-indicator" />
           <woot-button
@@ -38,6 +49,7 @@
             {{ $t('CONTACTS_PAGE.FILTER_CONTACTS') }}
           </woot-button>
         </div>
+
         <woot-button
           v-if="hasAppliedFilters && !hasActiveCustomViews"
           class="margin-right-small clear"
@@ -133,6 +145,9 @@ export default {
     onToggleCustomViewsModal() {
       this.$emit('on-toggle-save-filter');
     },
+    onToggleDeleteCustomViewsModal() {
+      this.$emit('on-toggle-delete-filter');
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue b/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
index 979a7f9bb..6d01e387c 100644
--- a/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
+++ b/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
@@ -30,31 +30,49 @@ export default {
       type: [String, Number],
       default: 0,
     },
+    activeFilterType: {
+      type: Number,
+      default: 0,
+    },
   },
 
   computed: {
+    activeCustomViews() {
+      if (this.activeFilterType === 0) {
+        return 'conversation';
+      }
+      if (this.activeFilterType === 1) {
+        return 'contact';
+      }
+      return '';
+    },
     deleteMessage() {
       return `${this.$t(
         'FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.MESSAGE'
       )} ${this.activeCustomView && this.activeCustomView.name} ?`;
     },
     deleteConfirmText() {
-      return `${this.$t('FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.YES')} ${this
-        .activeCustomView && this.activeCustomView.name}`;
+      return `${this.$t('FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.YES')}`;
     },
     deleteRejectText() {
-      return `${this.$t('FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.NO')} ${this
-        .activeCustomView && this.activeCustomView.name}`;
+      return `${this.$t('FILTER.CUSTOM_VIEWS.DELETE.MODAL.CONFIRM.NO')}`;
+    },
+    isFolderSection() {
+      return this.activeFilterType === 0 && this.$route.name !== 'home';
+    },
+    isSegmentSection() {
+      return (
+        this.activeFilterType === 1 && this.$route.name !== 'contacts_dashboard'
+      );
     },
   },
 
   methods: {
     async deleteSavedCustomViews() {
       try {
-        await this.$store.dispatch(
-          'customViews/delete',
-          Number(this.customViewsId)
-        );
+        const id = Number(this.customViewsId);
+        const filterType = this.activeCustomViews;
+        await this.$store.dispatch('customViews/delete', { id, filterType });
         this.closeDeletePopup();
         this.showAlert(
           this.$t('FILTER.CUSTOM_VIEWS.DELETE.API.SUCCESS_MESSAGE')
@@ -65,9 +83,12 @@ export default {
           this.$t('FILTER.CUSTOM_VIEWS.DELETE.API.ERROR_MESSAGE');
         this.showAlert(errorMessage);
       }
-      if (this.$route.name !== 'home') {
+      if (this.isFolderSection) {
         this.$router.push({ name: 'home' });
       }
+      if (this.isSegmentSection) {
+        this.$router.push({ name: 'contacts_dashboard' });
+      }
     },
     closeDeletePopup() {
       this.$emit('close');
diff --git a/app/javascript/dashboard/store/modules/customViews.js b/app/javascript/dashboard/store/modules/customViews.js
index 252db4107..40b126663 100644
--- a/app/javascript/dashboard/store/modules/customViews.js
+++ b/app/javascript/dashboard/store/modules/customViews.js
@@ -49,10 +49,10 @@ export const actions = {
       commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isCreating: false });
     }
   },
-  delete: async ({ commit }, id) => {
+  delete: async ({ commit }, { id, filterType }) => {
     commit(types.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: true });
     try {
-      await CustomViewsAPI.delete(id);
+      await CustomViewsAPI.deleteCustomViews(id, filterType);
       commit(types.DELETE_CUSTOM_VIEW, id);
     } catch (error) {
       throw new Error(error);
diff --git a/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
index 32d748a1b..5de9732c6 100644
--- a/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/customViews/actions.spec.js
@@ -51,18 +51,16 @@ describe('#actions', () => {
   describe('#delete', () => {
     it('sends correct actions if API is success', async () => {
       axios.delete.mockResolvedValue({ data: customViewList[0] });
-      await actions.delete({ commit }, customViewList[0].id);
+      await actions.delete({ commit }, { id: 1, filterType: 'contact' });
       expect(commit.mock.calls).toEqual([
         [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: true }],
-        [types.default.DELETE_CUSTOM_VIEW, customViewList[0].id],
+        [types.default.DELETE_CUSTOM_VIEW, 1],
         [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: false }],
       ]);
     });
     it('sends correct actions if API is error', async () => {
       axios.delete.mockRejectedValue({ message: 'Incorrect header' });
-      await expect(
-        actions.delete({ commit }, customViewList[0].id)
-      ).rejects.toThrow(Error);
+      await expect(actions.delete({ commit }, 1)).rejects.toThrow(Error);
       expect(commit.mock.calls).toEqual([
         [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: true }],
         [types.default.SET_CUSTOM_VIEW_UI_FLAG, { isDeleting: false }],

From 8cff690640d75759c3ce2b0ace4bb566d23642a8 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 25 Jan 2022 08:16:58 +0530
Subject: [PATCH 027/101] feat: Support multiple file upload on dashboard
 (#3748)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/dashboard/api/inbox/message.js        | 12 +++++++-----
 .../dashboard/api/specs/inbox/message.spec.js        |  2 +-
 .../widgets/WootWriter/ReplyBottomPanel.vue          |  5 +++++
 .../components/widgets/conversation/ReplyBox.vue     | 12 +++++++++---
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/javascript/dashboard/api/inbox/message.js b/app/javascript/dashboard/api/inbox/message.js
index bfea9a2b9..22f417052 100644
--- a/app/javascript/dashboard/api/inbox/message.js
+++ b/app/javascript/dashboard/api/inbox/message.js
@@ -7,14 +7,16 @@ export const buildCreatePayload = ({
   isPrivate,
   contentAttributes,
   echoId,
-  file,
+  files,
   ccEmails = '',
   bccEmails = '',
 }) => {
   let payload;
-  if (file) {
+  if (files && files.length !== 0) {
     payload = new FormData();
-    payload.append('attachments[]', file, file.name);
+    files.forEach(file => {
+      payload.append('attachments[]', file, file.name);
+    });
     if (message) {
       payload.append('content', message);
     }
@@ -46,7 +48,7 @@ class MessageApi extends ApiClient {
     private: isPrivate,
     contentAttributes,
     echo_id: echoId,
-    file,
+    files,
     ccEmails = '',
     bccEmails = '',
   }) {
@@ -58,7 +60,7 @@ class MessageApi extends ApiClient {
         isPrivate,
         contentAttributes,
         echoId,
-        file,
+        files,
         ccEmails,
         bccEmails,
       }),
diff --git a/app/javascript/dashboard/api/specs/inbox/message.spec.js b/app/javascript/dashboard/api/specs/inbox/message.spec.js
index dd9cba850..6953621cb 100644
--- a/app/javascript/dashboard/api/specs/inbox/message.spec.js
+++ b/app/javascript/dashboard/api/specs/inbox/message.spec.js
@@ -36,7 +36,7 @@ describe('#ConversationAPI', () => {
         echoId: 12,
         isPrivate: true,
 
-        file: new Blob(['test-content'], { type: 'application/pdf' }),
+        files: [new Blob(['test-content'], { type: 'application/pdf' })],
       });
       expect(formPayload).toBeInstanceOf(FormData);
       expect(formPayload.get('content')).toEqual('test content');
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 594aaa6aa..0a9ee3629 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -16,6 +16,7 @@
         ref="upload"
         :size="4096 * 4096"
         :accept="allowedFileTypes"
+        :multiple="enableMultipleFileUpload"
         :drop="true"
         :drop-directory="false"
         @input-file="onFileUpload"
@@ -144,6 +145,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    enableMultipleFileUpload: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     isNote() {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 83c209f8e..d7385a3fd 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -72,6 +72,7 @@
       :is-format-mode="showRichContentEditor"
       :enable-rich-editor="isRichEditorEnabled"
       :enter-to-send-enabled="enterToSendEnabled"
+      :enable-multiple-file-upload="enableMultipleFileUpload"
       @toggleEnterToSend="toggleEnterToSend"
     />
   </div>
@@ -283,6 +284,9 @@ export default {
     showReplyHead() {
       return !this.isOnPrivateNote && this.isAnEmailChannel;
     },
+    enableMultipleFileUpload() {
+      return this.isAnEmailChannel || this.isAWebWidgetInbox || this.isAPIInbox;
+    },
   },
   watch: {
     currentChat(conversation) {
@@ -469,7 +473,6 @@ export default {
       );
     },
     getMessagePayload(message) {
-      const [attachment] = this.attachedFiles;
       const messagePayload = {
         conversationId: this.currentChat.id,
         message,
@@ -480,8 +483,11 @@ export default {
         messagePayload.contentAttributes = { in_reply_to: this.inReplyTo };
       }
 
-      if (attachment) {
-        messagePayload.file = attachment.resource.file;
+      if (this.attachedFiles && this.attachedFiles.length) {
+        messagePayload.files = [];
+        this.attachedFiles.forEach(attachment => {
+          messagePayload.files.push(attachment.resource.file);
+        });
       }
 
       if (this.ccEmails) {

From 23965fbaa3c729ab8da21c015e2682f1efb16422 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 25 Jan 2022 16:39:19 -0800
Subject: [PATCH 028/101] fix: Return if window.$chatwoot is already defined
 (#3847)

---
 app/javascript/packs/sdk.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js
index d666b864b..bd2d718aa 100755
--- a/app/javascript/packs/sdk.js
+++ b/app/javascript/packs/sdk.js
@@ -27,6 +27,10 @@ export const hasUserKeys = user =>
   REQUIRED_USER_KEYS.reduce((acc, key) => acc || !!user[key], false);
 
 const runSDK = ({ baseUrl, websiteToken }) => {
+  if (window.$chatwoot) {
+    return;
+  }
+
   const chatwootSettings = window.chatwootSettings || {};
   window.$chatwoot = {
     baseUrl,

From 34e8ad9dc55ec55137f8b8b066e1da63186b1eca Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 25 Jan 2022 16:58:49 -0800
Subject: [PATCH 029/101] feat: Unify user and super admin credentials (#3830)

Fixes: #3061, #3489
---
 app/builders/account_builder.rb               |  3 +-
 .../installation/onboarding_controller.rb     |  1 +
 .../super_admin/devise/sessions_controller.rb |  2 +-
 .../super_admin/super_admins_controller.rb    | 44 -----------
 .../super_admin/users_controller.rb           | 13 ++--
 app/dashboards/super_admin_dashboard.rb       | 75 -------------------
 app/dashboards/user_dashboard.rb              |  6 ++
 app/models/concerns/avatarable.rb             |  2 +-
 app/models/super_admin.rb                     | 50 ++++++++-----
 app/models/user.rb                            |  1 +
 app/views/fields/belongs_to/_form.html.erb    | 26 +++++++
 app/views/fields/belongs_to/_index.html.erb   | 32 ++++++++
 app/views/fields/belongs_to/_show.html.erb    | 27 +++++++
 app/views/fields/polymorphic/_form.html.erb   | 29 +++++++
 app/views/fields/polymorphic/_index.html.erb  | 31 ++++++++
 app/views/fields/polymorphic/_show.html.erb   | 28 +++++++
 .../application/_navigation.html.erb          |  5 ++
 .../super_admin/users/_collection.html.erb    |  8 +-
 config/initializers/rack_attack.rb            |  9 +++
 config/routes.rb                              |  1 -
 .../20220121055444_add_type_to_users.rb       | 42 +++++++++++
 db/schema.rb                                  |  3 +-
 db/seeds.rb                                   |  3 +-
 .../access_tokens_controller_spec.rb          |  2 +-
 .../account_users_controller_spec.rb          |  2 +-
 .../super_admin/accounts_controller_spec.rb   |  2 +-
 .../super_admin/agent_bots_controller_spec.rb |  2 +-
 .../super_admin/app_config_controller_spec.rb |  4 +-
 .../installation_configs_controller_spec.rb   |  6 +-
 .../platform_apps_controller_spec.rb          |  2 +-
 .../super_admins_controller_spec.rb           | 24 ------
 .../super_admin/users_controller_spec.rb      |  2 +-
 .../super_admin_controller_spec.rb            | 46 ------------
 spec/factories/super_admins.rb                |  3 +
 34 files changed, 303 insertions(+), 233 deletions(-)
 delete mode 100644 app/controllers/super_admin/super_admins_controller.rb
 delete mode 100644 app/dashboards/super_admin_dashboard.rb
 create mode 100644 app/views/fields/belongs_to/_form.html.erb
 create mode 100644 app/views/fields/belongs_to/_index.html.erb
 create mode 100644 app/views/fields/belongs_to/_show.html.erb
 create mode 100644 app/views/fields/polymorphic/_form.html.erb
 create mode 100644 app/views/fields/polymorphic/_index.html.erb
 create mode 100644 app/views/fields/polymorphic/_show.html.erb
 create mode 100644 db/migrate/20220121055444_add_type_to_users.rb
 delete mode 100644 spec/controllers/super_admin/super_admins_controller_spec.rb
 delete mode 100644 spec/controllers/super_admin_controller_spec.rb

diff --git a/app/builders/account_builder.rb b/app/builders/account_builder.rb
index 0464c8013..575f14aaa 100644
--- a/app/builders/account_builder.rb
+++ b/app/builders/account_builder.rb
@@ -2,7 +2,7 @@
 
 class AccountBuilder
   include CustomExceptions::Account
-  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password]
+  pattr_initialize [:account_name!, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin]
 
   def perform
     if @user.nil?
@@ -65,6 +65,7 @@ class AccountBuilder
                      password: user_password,
                      password_confirmation: user_password,
                      name: @user_full_name)
+    @user.type = 'SuperAdmin' if @super_admin
     @user.confirm if @confirmed
     @user.save!
   end
diff --git a/app/controllers/installation/onboarding_controller.rb b/app/controllers/installation/onboarding_controller.rb
index 130938fd8..272b4e5eb 100644
--- a/app/controllers/installation/onboarding_controller.rb
+++ b/app/controllers/installation/onboarding_controller.rb
@@ -10,6 +10,7 @@ class Installation::OnboardingController < ApplicationController
         user_full_name: onboarding_params.dig(:user, :name),
         email: onboarding_params.dig(:user, :email),
         user_password: params.dig(:user, :password),
+        super_admin: true,
         confirmed: true
       ).perform
     rescue StandardError => e
diff --git a/app/controllers/super_admin/devise/sessions_controller.rb b/app/controllers/super_admin/devise/sessions_controller.rb
index de7002206..b5e50d177 100644
--- a/app/controllers/super_admin/devise/sessions_controller.rb
+++ b/app/controllers/super_admin/devise/sessions_controller.rb
@@ -8,7 +8,7 @@ class SuperAdmin::Devise::SessionsController < Devise::SessionsController
   def create
     redirect_to(super_admin_session_path, flash: { error: @error_message }) && return unless valid_credentials?
 
-    sign_in(@super_admin, scope: :super_admin)
+    sign_in(:super_admin, @super_admin)
     flash.discard
     redirect_to super_admin_users_path
   end
diff --git a/app/controllers/super_admin/super_admins_controller.rb b/app/controllers/super_admin/super_admins_controller.rb
deleted file mode 100644
index 16d91a151..000000000
--- a/app/controllers/super_admin/super_admins_controller.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-class SuperAdmin::SuperAdminsController < SuperAdmin::ApplicationController
-  # Overwrite any of the RESTful controller actions to implement custom behavior
-  # For example, you may want to send an email after a foo is updated.
-  #
-  # def update
-  #   super
-  #   send_foo_updated_email(requested_resource)
-  # end
-
-  # Override this method to specify custom lookup behavior.
-  # This will be used to set the resource for the `show`, `edit`, and `update`
-  # actions.
-  #
-  # def find_resource(param)
-  #   Foo.find_by!(slug: param)
-  # end
-
-  # The result of this lookup will be available as `requested_resource`
-
-  # Override this if you have certain roles that require a subset
-  # this will be used to set the records shown on the `index` action.
-  #
-  # def scoped_resource
-  #   if current_user.super_admin?
-  #     resource_class
-  #   else
-  #     resource_class.with_less_stuff
-  #   end
-  # end
-
-  # Override `resource_params` if you want to transform the submitted
-  # data before it's persisted. For example, the following would turn all
-  # empty values into nil values. It uses other APIs such as `resource_class`
-  # and `dashboard`:
-  #
-  # def resource_params
-  #   params.require(resource_class.model_name.param_key).
-  #     permit(dashboard.permitted_attributes).
-  #     transform_values { |value| value == "" ? nil : value }
-  # end
-
-  # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
-  # for more information
-end
diff --git a/app/controllers/super_admin/users_controller.rb b/app/controllers/super_admin/users_controller.rb
index 613670849..23c212c29 100644
--- a/app/controllers/super_admin/users_controller.rb
+++ b/app/controllers/super_admin/users_controller.rb
@@ -33,12 +33,15 @@ class SuperAdmin::UsersController < SuperAdmin::ApplicationController
   # empty values into nil values. It uses other APIs such as `resource_class`
   # and `dashboard`:
   #
-  # def resource_params
-  #   params.require(resource_class.model_name.param_key).
-  #     permit(dashboard.permitted_attributes).
-  #     transform_values { |value| value == "" ? nil : value }
-  # end
+  def resource_params
+    permitted_params = super
+    permitted_params.delete(:password) if permitted_params[:password].blank?
+    permitted_params
+  end
 
   # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
   # for more information
+  def find_resource(param)
+    super.becomes(User)
+  end
 end
diff --git a/app/dashboards/super_admin_dashboard.rb b/app/dashboards/super_admin_dashboard.rb
deleted file mode 100644
index 1d9afd1ba..000000000
--- a/app/dashboards/super_admin_dashboard.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'administrate/base_dashboard'
-
-class SuperAdminDashboard < Administrate::BaseDashboard
-  # ATTRIBUTE_TYPES
-  # a hash that describes the type of each of the model's fields.
-  #
-  # Each different type represents an Administrate::Field object,
-  # which determines how the attribute is displayed
-  # on pages throughout the dashboard.
-  ATTRIBUTE_TYPES = {
-    id: Field::Number,
-    email: Field::String,
-    password: Field::Password,
-    remember_created_at: Field::DateTime,
-    sign_in_count: Field::Number,
-    current_sign_in_at: Field::DateTime,
-    last_sign_in_at: Field::DateTime,
-    current_sign_in_ip: Field::String.with_options(searchable: false),
-    last_sign_in_ip: Field::String.with_options(searchable: false),
-    created_at: Field::DateTime,
-    updated_at: Field::DateTime
-  }.freeze
-
-  # COLLECTION_ATTRIBUTES
-  # an array of attributes that will be displayed on the model's index page.
-  #
-  # By default, it's limited to four items to reduce clutter on index pages.
-  # Feel free to add, remove, or rearrange items.
-  COLLECTION_ATTRIBUTES = %i[
-    id
-    email
-  ].freeze
-
-  # SHOW_PAGE_ATTRIBUTES
-  # an array of attributes that will be displayed on the model's show page.
-  SHOW_PAGE_ATTRIBUTES = %i[
-    id
-    email
-    remember_created_at
-    sign_in_count
-    current_sign_in_at
-    last_sign_in_at
-    current_sign_in_ip
-    last_sign_in_ip
-    created_at
-    updated_at
-  ].freeze
-
-  # FORM_ATTRIBUTES
-  # an array of attributes that will be displayed
-  # on the model's form (`new` and `edit`) pages.
-  FORM_ATTRIBUTES = %i[
-    email
-    password
-  ].freeze
-
-  # COLLECTION_FILTERS
-  # a hash that defines filters that can be used while searching via the search
-  # field of the dashboard.
-  #
-  # For example to add an option to search for open resources by typing "open:"
-  # in the search field:
-  #
-  #   COLLECTION_FILTERS = {
-  #     open: ->(resources) { resources.where(open: true) }
-  #   }.freeze
-  COLLECTION_FILTERS = {}.freeze
-
-  # Overwrite this method to customize how super admins are displayed
-  # across all pages of the admin dashboard.
-  #
-  # def display_resource(super_admin)
-  #   "SuperAdmin ##{super_admin.id}"
-  # end
-end
diff --git a/app/dashboards/user_dashboard.rb b/app/dashboards/user_dashboard.rb
index f34f48257..1d59525f2 100644
--- a/app/dashboards/user_dashboard.rb
+++ b/app/dashboards/user_dashboard.rb
@@ -30,6 +30,7 @@ class UserDashboard < Administrate::BaseDashboard
     created_at: Field::DateTime,
     updated_at: Field::DateTime,
     pubsub_token: Field::String,
+    type: Field::Select.with_options(collection: [nil, 'SuperAdmin']),
     accounts: CountField
   }.freeze
 
@@ -44,6 +45,7 @@ class UserDashboard < Administrate::BaseDashboard
     name
     email
     accounts
+    type
   ].freeze
 
   # SHOW_PAGE_ATTRIBUTES
@@ -53,10 +55,12 @@ class UserDashboard < Administrate::BaseDashboard
     avatar_url
     unconfirmed_email
     name
+    type
     display_name
     email
     created_at
     updated_at
+    confirmed_at
     account_users
   ].freeze
 
@@ -68,6 +72,8 @@ class UserDashboard < Administrate::BaseDashboard
     display_name
     email
     password
+    confirmed_at
+    type
   ].freeze
 
   # COLLECTION_FILTERS
diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb
index d5bcb862d..441afa106 100644
--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -12,7 +12,7 @@ module Avatarable
   def avatar_url
     return url_for(avatar.representation(resize: '250x250')) if avatar.attached? && avatar.representable?
 
-    if [User, Contact].include?(self.class) && email.present?
+    if [SuperAdmin, User, Contact].include?(self.class) && email.present?
       hash = Digest::MD5.hexdigest(email)
       return "https://www.gravatar.com/avatar/#{hash}?d=404"
     end
diff --git a/app/models/super_admin.rb b/app/models/super_admin.rb
index 5bad00c05..acc5f28dd 100644
--- a/app/models/super_admin.rb
+++ b/app/models/super_admin.rb
@@ -1,25 +1,41 @@
 # == Schema Information
 #
-# Table name: super_admins
+# Table name: users
 #
-#  id                  :bigint           not null, primary key
-#  current_sign_in_at  :datetime
-#  current_sign_in_ip  :inet
-#  email               :string           default(""), not null
-#  encrypted_password  :string           default(""), not null
-#  last_sign_in_at     :datetime
-#  last_sign_in_ip     :inet
-#  remember_created_at :datetime
-#  sign_in_count       :integer          default(0), not null
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  id                     :integer          not null, primary key
+#  availability           :integer          default("online")
+#  confirmation_sent_at   :datetime
+#  confirmation_token     :string
+#  confirmed_at           :datetime
+#  current_sign_in_at     :datetime
+#  current_sign_in_ip     :string
+#  custom_attributes      :jsonb
+#  display_name           :string
+#  email                  :string
+#  encrypted_password     :string           default(""), not null
+#  last_sign_in_at        :datetime
+#  last_sign_in_ip        :string
+#  name                   :string           not null
+#  provider               :string           default("email"), not null
+#  pubsub_token           :string
+#  remember_created_at    :datetime
+#  reset_password_sent_at :datetime
+#  reset_password_token   :string
+#  sign_in_count          :integer          default(0), not null
+#  tokens                 :json
+#  type                   :string
+#  ui_settings            :jsonb
+#  uid                    :string           default(""), not null
+#  unconfirmed_email      :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #
 # Indexes
 #
-#  index_super_admins_on_email  (email) UNIQUE
+#  index_users_on_email                 (email)
+#  index_users_on_pubsub_token          (pubsub_token) UNIQUE
+#  index_users_on_reset_password_token  (reset_password_token) UNIQUE
+#  index_users_on_uid_and_provider      (uid,provider) UNIQUE
 #
-class SuperAdmin < ApplicationRecord
-  # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
-  devise :database_authenticatable, :trackable, :rememberable, :validatable, :password_has_required_content
+class SuperAdmin < User
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 16798904c..773277e15 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,6 +23,7 @@
 #  reset_password_token   :string
 #  sign_in_count          :integer          default(0), not null
 #  tokens                 :json
+#  type                   :string
 #  ui_settings            :jsonb
 #  uid                    :string           default(""), not null
 #  unconfirmed_email      :string
diff --git a/app/views/fields/belongs_to/_form.html.erb b/app/views/fields/belongs_to/_form.html.erb
new file mode 100644
index 000000000..5e8b62ca3
--- /dev/null
+++ b/app/views/fields/belongs_to/_form.html.erb
@@ -0,0 +1,26 @@
+<%#
+# BelongsTo Form Partial
+
+This partial renders an input element for belongs_to relationships.
+By default, the input is a collection select box
+that displays all possible records to associate with.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::BelongsTo][1].
+  Contains helper methods for displaying a collection select box.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/BelongsTo
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.permitted_attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.select(field.permitted_attribute,
+               options_for_select(field.associated_resource_options, field.selected_option),
+               include_blank: field.include_blank_option) %>
+</div>
diff --git a/app/views/fields/belongs_to/_index.html.erb b/app/views/fields/belongs_to/_index.html.erb
new file mode 100644
index 000000000..8637400ca
--- /dev/null
+++ b/app/views/fields/belongs_to/_index.html.erb
@@ -0,0 +1,32 @@
+<%#
+# BelongsTo Index Partial
+
+This partial renders a belongs_to relationship,
+to be displayed on a resource's index page.
+
+By default, the relationship is rendered as a link to the associated object.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::BelongsTo][1].
+  A wrapper around the belongs_to relationship pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/BelongsTo
+%>
+
+<% if field.data %>
+  <% if field.data.is_a? User %>
+    <%= link_to(
+      field.display_associated_resource,
+      super_admin_user_path(field.data),
+    ) %>
+  <% elsif valid_action?(:show, field.associated_class) %>
+    <%= link_to(
+      field.display_associated_resource,
+      [namespace, field.data],
+    ) %>
+  <% else %>
+    <%= field.display_associated_resource %>
+  <% end %>
+<% end %>
diff --git a/app/views/fields/belongs_to/_show.html.erb b/app/views/fields/belongs_to/_show.html.erb
new file mode 100644
index 000000000..24b47081a
--- /dev/null
+++ b/app/views/fields/belongs_to/_show.html.erb
@@ -0,0 +1,27 @@
+<%#
+# BelongsTo Show Partial
+
+This partial renders a belongs_to relationship,
+to be displayed on a resource's show page.
+
+By default, the relationship is rendered as a link to the associated object.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::BelongsTo][1].
+  A wrapper around the belongs_to relationship pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/BelongsTo
+%>
+
+<% if field.data %>
+  <% if valid_action?(:show, field.associated_class) %>
+    <%= link_to(
+      field.display_associated_resource,
+      [namespace, field.data],
+    ) %>
+  <% else %>
+    <%= field.display_associated_resource %>
+  <% end %>
+<% end %>
diff --git a/app/views/fields/polymorphic/_form.html.erb b/app/views/fields/polymorphic/_form.html.erb
new file mode 100644
index 000000000..edf0c62d5
--- /dev/null
+++ b/app/views/fields/polymorphic/_form.html.erb
@@ -0,0 +1,29 @@
+<%#
+# Polymorphic Form Partial
+
+This partial renders an input element for polymorphic relationships.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Polymorphic][1].
+  A wrapper around the polymorphic belongs_to relationship
+  pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Polymorphic
+%>
+
+<%= f.fields_for field.attribute do |pf| %>
+  <div class="field-unit__label">
+    <%= pf.label :value, field.name.humanize %>
+  </div>
+
+  <div class="field-unit__field">
+    <%= pf.hidden_field(:type, value: field.class.name) %>
+    <%= pf.select(:value) do %>
+      <%= grouped_options_for_select(field.associated_resource_grouped_options, field.selected_global_id, prompt: true) %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/fields/polymorphic/_index.html.erb b/app/views/fields/polymorphic/_index.html.erb
new file mode 100644
index 000000000..f1e4d499f
--- /dev/null
+++ b/app/views/fields/polymorphic/_index.html.erb
@@ -0,0 +1,31 @@
+<%#
+# Polymorphic Index Partial
+
+This partial renders a polymorphic relationship,
+to be displayed on a resource's index page.
+
+By default, the relationship is rendered as a link to the associated object.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Polymorphic][1].
+  A wrapper around the polymorphic belongs_to relationship
+  pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Polymorphic
+%>
+
+<% if field.data %>
+  <% if field.data.is_a? User %>
+    <%= link_to(
+      "User ##{field.data.id}",
+      super_admin_user_path(field.data)
+    ) %>
+  <% else %>
+    <%= link_to(
+      field.display_associated_resource,
+      [namespace, field.data]
+    ) %>
+  <% end %>
+<% end %>
diff --git a/app/views/fields/polymorphic/_show.html.erb b/app/views/fields/polymorphic/_show.html.erb
new file mode 100644
index 000000000..27a5645ae
--- /dev/null
+++ b/app/views/fields/polymorphic/_show.html.erb
@@ -0,0 +1,28 @@
+<%#
+# Polymorphic Show Partial
+
+This partial renders a polymorphic relationship,
+to be displayed on a resource's show page.
+
+By default, the relationship is rendered as a link to the associated object.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Polymorphic][1].
+  A wrapper around the polymorphic belongs_to relationship
+  pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Polymorphic
+%>
+
+<% if field.data %>
+  <% if valid_action?(:show, field.data.class) %>
+    <%= link_to(
+      field.display_associated_resource,
+      [namespace, field.data],
+    ) %>
+  <% else %>
+    <%= field.display_associated_resource %>
+  <% end %>
+<% end %>
diff --git a/app/views/super_admin/application/_navigation.html.erb b/app/views/super_admin/application/_navigation.html.erb
index fb4fd9018..73e7c29af 100644
--- a/app/views/super_admin/application/_navigation.html.erb
+++ b/app/views/super_admin/application/_navigation.html.erb
@@ -56,9 +56,14 @@ as defined by the routes in the `admin/` namespace
     </li>
   </ul>
   <ul class="logout">
+   
     <li class="navigation__link">
       <i class="ion ion-log-out"></i>
       <%= link_to "Logout", super_admin_logout_url %>
     </li>
+    <li class="navigation__link">
+      <i class="ion ion-android-contacts"></i>
+      <%= link_to "Agent Dashboard", '/' %>
+    </li>
   </ul>
 </div>
diff --git a/app/views/super_admin/users/_collection.html.erb b/app/views/super_admin/users/_collection.html.erb
index 3f7aa489c..f1f25987c 100644
--- a/app/views/super_admin/users/_collection.html.erb
+++ b/app/views/super_admin/users/_collection.html.erb
@@ -57,13 +57,13 @@ to display a collection of resources in an HTML table.
       <tr class="js-table-row"
           tabindex="0"
           <% if valid_action? :show, collection_presenter.resource_name %>
-            <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) %>
+            <%= %(role=link data-url=#{polymorphic_path([namespace, resource.becomes(User)])}) %>
           <% end %>
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
             <% if show_action? :show, resource -%>
-              <a href="<%= polymorphic_path([namespace, resource]) -%>"
+              <a href="<%= polymorphic_path([namespace, resource.becomes(User)]) -%>"
                  class="action-show"
                  >
                 <%= render_field attribute %>
@@ -75,7 +75,7 @@ to display a collection of resources in an HTML table.
         <% if valid_action? :edit, collection_presenter.resource_name %>
           <td><%= link_to(
             t("administrate.actions.edit"),
-            [:edit, namespace, resource],
+            [:edit, namespace, resource.becomes(User)],
             class: "action-edit",
           ) if show_action? :edit, resource%></td>
         <% end %>
@@ -83,7 +83,7 @@ to display a collection of resources in an HTML table.
         <% if valid_action? :destroy, collection_presenter.resource_name %>
           <td><%= link_to(
             t("administrate.actions.destroy"),
-            [namespace, resource],
+            [namespace, resource.becomes(User)],
             class: "text-color-red",
             method: :delete,
             data: { confirm: t("administrate.actions.confirm") }
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 39556b6f2..87deded55 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -72,6 +72,15 @@ class Rack::Attack
     end
   end
 
+  throttle('super_admin_login/email', limit: 20, period: 5.minutes) do |req|
+    if req.path == '/super_admin/sign_in' && req.post?
+      # NOTE: This line used to throw ArgumentError /rails/action_mailbox/sendgrid/inbound_emails : invalid byte sequence in UTF-8
+      # Hence placed in the if block
+      email = req.params['email'].presence || ActionDispatch::Request.new(req.env).params['email'].presence
+      email.to_s.downcase.gsub(/\s+/, '')
+    end
+  end
+
   throttle('reset_password/email', limit: 5, period: 1.hour) do |req|
     if req.path == '/auth/password' && req.post?
       email = req.params['email'].presence || ActionDispatch::Request.new(req.env).params['email'].presence
diff --git a/config/routes.rb b/config/routes.rb
index aaf0330ea..880f8bdcc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -303,7 +303,6 @@ Rails.application.routes.draw do
       # order of resources affect the order of sidebar navigation in super admin
       resources :accounts
       resources :users, only: [:index, :new, :create, :show, :edit, :update]
-      resources :super_admins
       resources :access_tokens, only: [:index, :show]
       resources :installation_configs, only: [:index, :new, :create, :show, :edit, :update]
 
diff --git a/db/migrate/20220121055444_add_type_to_users.rb b/db/migrate/20220121055444_add_type_to_users.rb
new file mode 100644
index 000000000..b4e0687b5
--- /dev/null
+++ b/db/migrate/20220121055444_add_type_to_users.rb
@@ -0,0 +1,42 @@
+class AddTypeToUsers < ActiveRecord::Migration[6.1]
+  def change
+    add_column :users, :type, :string
+    migrate_existing_super_admins
+
+    drop_table :super_admins do |t|
+      t.string :email,              null: false, default: ''
+      t.string :encrypted_password, null: false, default: ''
+      t.datetime :remember_created_at
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.inet     :current_sign_in_ip
+      t.inet     :last_sign_in_ip
+      t.timestamps null: false
+    end
+  end
+
+  private
+
+  def old_super_admins
+    ActiveRecord::Base.connection.execute('SELECT * from super_admins').to_a
+  end
+
+  def create_user_account_for_super_admin(super_admin)
+    u = User.new(email: super_admin['email'], name: "SuperUser #{super_admin['id']}", encrypted_password: super_admin['encrypted_password'],
+                 confirmed_at: DateTime.now, type: 'SuperAdmin')
+    u.save(validate: false)
+  end
+
+  def migrate_existing_super_admins
+    old_super_admins.each do |super_admin|
+      user = User.find_by(email: super_admin['email'])
+      if user.present?
+        user.update(type: 'SuperAdmin')
+      else
+        Rails.logger.debug { "User with email #{super_admin['email']} not found" }
+        create_user_account_for_super_admin(super_admin)
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index de8245d92..8dc74b602 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_01_11_223630) do
+ActiveRecord::Schema.define(version: 2022_01_21_055444) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -745,6 +745,7 @@ ActiveRecord::Schema.define(version: 2022_01_11_223630) do
     t.integer "availability", default: 0
     t.jsonb "ui_settings", default: {}
     t.jsonb "custom_attributes", default: {}
+    t.string "type"
     t.index ["email"], name: "index_users_on_email"
     t.index ["pubsub_token"], name: "index_users_on_pubsub_token", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
diff --git a/db/seeds.rb b/db/seeds.rb
index 306d8ba2d..47ce3f6fb 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -10,7 +10,6 @@ end
 
 ## Seeds for Local Development
 unless Rails.env.production?
-  SuperAdmin.create!(email: 'john@acme.inc', password: 'Password1!')
 
   account = Account.create!(
     name: 'Acme Inc'
@@ -20,7 +19,7 @@ unless Rails.env.production?
     name: 'Acme Org'
   )
 
-  user = User.new(name: 'John', email: 'john@acme.inc', password: 'Password1!')
+  user = User.new(name: 'John', email: 'john@acme.inc', password: 'Password1!', type: 'SuperAdmin')
   user.skip_confirmation!
   user.save!
 
diff --git a/spec/controllers/super_admin/access_tokens_controller_spec.rb b/spec/controllers/super_admin/access_tokens_controller_spec.rb
index ace011663..8e0eb5430 100644
--- a/spec/controllers/super_admin/access_tokens_controller_spec.rb
+++ b/spec/controllers/super_admin/access_tokens_controller_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe 'Super Admin access tokens API', type: :request do
 
     context 'when it is an authenticated super admin' do
       it 'shows the list of access tokens' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/access_tokens'
         expect(response).to have_http_status(:success)
         expect(response.body).to include(platform_app.access_token.token)
diff --git a/spec/controllers/super_admin/account_users_controller_spec.rb b/spec/controllers/super_admin/account_users_controller_spec.rb
index 64b4d0e71..6fe705630 100644
--- a/spec/controllers/super_admin/account_users_controller_spec.rb
+++ b/spec/controllers/super_admin/account_users_controller_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'Super Admin Account Users API', type: :request do
 
     context 'when it is an authenticated super admin' do
       it 'shows the account user create page' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/account_users/new'
         expect(response).to have_http_status(:success)
       end
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index f4da5ad3d..1f155609a 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Super Admin accounts API', type: :request do
       let!(:account) { create(:account) }
 
       it 'shows the list of accounts' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/accounts'
         expect(response).to have_http_status(:success)
         expect(response.body).to include('New account')
diff --git a/spec/controllers/super_admin/agent_bots_controller_spec.rb b/spec/controllers/super_admin/agent_bots_controller_spec.rb
index 39aa3cfe4..63548e441 100644
--- a/spec/controllers/super_admin/agent_bots_controller_spec.rb
+++ b/spec/controllers/super_admin/agent_bots_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Super Admin agent-bots API', type: :request do
       let!(:agent_bot) { create(:agent_bot) }
 
       it 'shows the list of users' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/agent_bots'
         expect(response).to have_http_status(:success)
         expect(response.body).to include(agent_bot.name)
diff --git a/spec/controllers/super_admin/app_config_controller_spec.rb b/spec/controllers/super_admin/app_config_controller_spec.rb
index 9676790ce..3a81ac7d3 100644
--- a/spec/controllers/super_admin/app_config_controller_spec.rb
+++ b/spec/controllers/super_admin/app_config_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Super Admin Application Config API', type: :request do
       let!(:config) { create(:installation_config, { name: 'FB_APP_ID', value: 'TESTVALUE' }) }
 
       it 'shows the app_config page' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/app_config'
         expect(response).to have_http_status(:success)
         expect(response.body).to include(config.name)
@@ -33,7 +33,7 @@ RSpec.describe 'Super Admin Application Config API', type: :request do
 
     context 'when it is an aunthenticated super admin' do
       it 'shows the app_config page' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         post '/super_admin/app_config', params: { app_config: { TESTKEY: 'TESTVALUE' } }
 
         expect(response.status).to eq(302)
diff --git a/spec/controllers/super_admin/installation_configs_controller_spec.rb b/spec/controllers/super_admin/installation_configs_controller_spec.rb
index 263e63c24..f1b6c82d3 100644
--- a/spec/controllers/super_admin/installation_configs_controller_spec.rb
+++ b/spec/controllers/super_admin/installation_configs_controller_spec.rb
@@ -19,20 +19,20 @@ RSpec.describe 'Super Admin Installation Config API', type: :request do
       end
 
       it 'shows the installation_configs create page' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/installation_configs/new'
         expect(response).to have_http_status(:success)
       end
 
       it 'shows the installation_configs edit page' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         editable_config = InstallationConfig.editable.first
         get "/super_admin/installation_configs/#{editable_config.id}/edit"
         expect(response).to have_http_status(:success)
       end
 
       it 'shows the installation_configs list page' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/installation_configs'
         expect(response).to have_http_status(:success)
         expect(response.body).to include(config.name)
diff --git a/spec/controllers/super_admin/platform_apps_controller_spec.rb b/spec/controllers/super_admin/platform_apps_controller_spec.rb
index 6ce9c9942..fca14fc1f 100644
--- a/spec/controllers/super_admin/platform_apps_controller_spec.rb
+++ b/spec/controllers/super_admin/platform_apps_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Super Admin platform app API', type: :request do
       let!(:platform_app) { create(:platform_app) }
 
       it 'shows the list of users' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/platform_apps'
         expect(response).to have_http_status(:success)
         expect(response.body).to include(platform_app.name)
diff --git a/spec/controllers/super_admin/super_admins_controller_spec.rb b/spec/controllers/super_admin/super_admins_controller_spec.rb
deleted file mode 100644
index 0255b520c..000000000
--- a/spec/controllers/super_admin/super_admins_controller_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Super Admin super admins API', type: :request do
-  let(:super_admin) { create(:super_admin) }
-
-  describe 'GET /super_admin/users' do
-    context 'when it is an unauthenticated super admin' do
-      it 'returns unauthorized' do
-        get '/super_admin/super_admins'
-        expect(response).to have_http_status(:redirect)
-      end
-    end
-
-    context 'when it is an authenticated super admin' do
-      it 'shows the list of super admins' do
-        sign_in super_admin
-        get '/super_admin/super_admins'
-        expect(response).to have_http_status(:success)
-        expect(response.body).to include('New super admin')
-        expect(response.body).to include(super_admin.email)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/super_admin/users_controller_spec.rb b/spec/controllers/super_admin/users_controller_spec.rb
index 16891823a..c34c91d2a 100644
--- a/spec/controllers/super_admin/users_controller_spec.rb
+++ b/spec/controllers/super_admin/users_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Super Admin Users API', type: :request do
       let!(:user) { create(:user) }
 
       it 'shows the list of users' do
-        sign_in super_admin
+        sign_in(super_admin, scope: :super_admin)
         get '/super_admin/users'
         expect(response).to have_http_status(:success)
         expect(response.body).to include('New user')
diff --git a/spec/controllers/super_admin_controller_spec.rb b/spec/controllers/super_admin_controller_spec.rb
deleted file mode 100644
index 8fbece081..000000000
--- a/spec/controllers/super_admin_controller_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Super Admin', type: :request do
-  let(:super_admin) { create(:super_admin) }
-
-  describe 'request to /super_admin' do
-    context 'when the super admin is unauthenticated' do
-      it 'redirects to signin page' do
-        get '/super_admin/'
-        expect(response).to have_http_status(:redirect)
-        expect(response.body).to include('sign_in')
-      end
-
-      it 'signs super admin in and out' do
-        sign_in super_admin
-        get '/super_admin'
-        expect(response).to have_http_status(:success)
-        expect(response.body).to include('Dashboard')
-
-        sign_out super_admin
-        get '/super_admin'
-        expect(response).to have_http_status(:redirect)
-      end
-    end
-  end
-
-  describe 'request to /super_admin/sidekiq' do
-    context 'when the super admin is unauthenticated' do
-      it 'redirects to signin page' do
-        get '/monitoring/sidekiq'
-        expect(response).to have_http_status(:not_found)
-        expect(response.body).to include('sign_in')
-      end
-
-      it 'signs super admin in and out' do
-        sign_in super_admin
-        get '/monitoring/sidekiq'
-        expect(response).to have_http_status(:success)
-
-        sign_out super_admin
-        get '/monitoring/sidekiq'
-        expect(response).to have_http_status(:not_found)
-      end
-    end
-  end
-end
diff --git a/spec/factories/super_admins.rb b/spec/factories/super_admins.rb
index fc0b485c5..fbb821ca0 100644
--- a/spec/factories/super_admins.rb
+++ b/spec/factories/super_admins.rb
@@ -1,6 +1,9 @@
 FactoryBot.define do
   factory :super_admin do
+    name { Faker::Name.name }
     email { "admin@#{SecureRandom.uuid}.com" }
     password { 'Password1!' }
+    type { 'SuperAdmin' }
+    confirmed_at { Time.zone.now }
   end
 end

From 59deffc7e36c521e982973371f958f61ab0f6c10 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 26 Jan 2022 15:59:48 -0800
Subject: [PATCH 030/101] feat: Ability to toggle conversation continuity via
 email (#3817)

Fixes: #3368
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  6 ++
 .../dashboard/settings/inbox/Settings.vue     | 24 +++++++-
 app/models/channel/web_widget.rb              |  4 +-
 app/models/message.rb                         | 11 +++-
 app/views/api/v1/models/_inbox.json.jbuilder  | 49 ++++++++-------
 config/routes.rb                              |  4 +-
 ...19051739_enable_conversation_continuity.rb |  5 ++
 db/schema.rb                                  |  1 +
 spec/models/message_spec.rb                   | 59 +++++++++++--------
 9 files changed, 113 insertions(+), 50 deletions(-)
 create mode 100644 db/migrate/20220119051739_enable_conversation_continuity.rb

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index fb1d5c35f..1b74e558e 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -310,6 +310,10 @@
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
       },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -356,6 +360,8 @@
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 79acdfef2..3cabb96b7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -215,7 +215,7 @@
           </p>
         </label>
 
-        <label class="medium-9 columns">
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ALLOW_MESSAGES_AFTER_RESOLVED') }}
           <select v-model="allowMessagesAfterResolved">
             <option :value="true">
@@ -234,6 +234,25 @@
           </p>
         </label>
 
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns">
+          {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_CONTINUITY_VIA_EMAIL') }}
+          <select v-model="continuityViaEmail">
+            <option :value="true">
+              {{ $t('INBOX_MGMT.EDIT.ENABLE_CONTINUITY_VIA_EMAIL.ENABLED') }}
+            </option>
+            <option :value="false">
+              {{ $t('INBOX_MGMT.EDIT.ENABLE_CONTINUITY_VIA_EMAIL.DISABLED') }}
+            </option>
+          </select>
+          <p class="help-text">
+            {{
+              $t(
+                'INBOX_MGMT.SETTINGS_POPUP.ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT'
+              )
+            }}
+          </p>
+        </label>
+
         <label v-if="isAWebWidgetInbox">
           {{ $t('INBOX_MGMT.FEATURES.LABEL') }}
         </label>
@@ -440,6 +459,7 @@ export default {
       isAgentListUpdating: false,
       csatSurveyEnabled: false,
       allowMessagesAfterResolved: true,
+      continuityViaEmail: true,
       selectedInboxName: '',
       channelWebsiteUrl: '',
       webhookUrl: '',
@@ -604,6 +624,7 @@ export default {
         this.emailCollectEnabled = this.inbox.enable_email_collect;
         this.csatSurveyEnabled = this.inbox.csat_survey_enabled;
         this.allowMessagesAfterResolved = this.inbox.allow_messages_after_resolved;
+        this.continuityViaEmail = this.inbox.continuity_via_email;
         this.channelWebsiteUrl = this.inbox.website_url;
         this.channelWelcomeTitle = this.inbox.welcome_title;
         this.channelWelcomeTagline = this.inbox.welcome_tagline;
@@ -659,6 +680,7 @@ export default {
             reply_time: this.replyTime || 'in_a_few_minutes',
             hmac_mandatory: this.hmacMandatory,
             tweets_enabled: this.tweetsEnabled,
+            continuity_via_email: this.continuityViaEmail,
           },
         };
         if (this.avatarFile) {
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index debee3bd5..7c3edcc77 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -3,6 +3,7 @@
 # Table name: channel_web_widgets
 #
 #  id                    :integer          not null, primary key
+#  continuity_via_email  :boolean          default(TRUE), not null
 #  feature_flags         :integer          default(3), not null
 #  hmac_mandatory        :boolean          default(FALSE)
 #  hmac_token            :string
@@ -29,7 +30,8 @@ class Channel::WebWidget < ApplicationRecord
   include FlagShihTzu
 
   self.table_name = 'channel_web_widgets'
-  EDITABLE_ATTRS = [:website_url, :widget_color, :welcome_title, :welcome_tagline, :reply_time, :pre_chat_form_enabled, :hmac_mandatory,
+  EDITABLE_ATTRS = [:website_url, :widget_color, :welcome_title, :welcome_tagline, :reply_time, :pre_chat_form_enabled,
+                    :continuity_via_email, :hmac_mandatory,
                     { pre_chat_form_options: [:pre_chat_message, :require_email] },
                     { selected_feature_flags: [] }].freeze
 
diff --git a/app/models/message.rb b/app/models/message.rb
index bd9c3c422..e8f3c3727 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -185,6 +185,14 @@ class Message < ApplicationRecord
     ::MessageTemplates::HookExecutionService.new(message: self).perform
   end
 
+  def email_notifiable_webwidget?
+    inbox.web_widget? && inbox.channel.continuity_via_email
+  end
+
+  def email_notifiable_channel?
+    email_notifiable_webwidget? || %w[Email].include?(inbox.inbox_type)
+  end
+
   def email_notifiable_message?
     return false unless outgoing? || input_csat?
     return false if private?
@@ -194,7 +202,8 @@ class Message < ApplicationRecord
 
   def can_notify_via_mail?
     return unless email_notifiable_message?
-    return false if conversation.contact.email.blank? || !(%w[Website Email].include? inbox.inbox_type)
+    return unless email_notifiable_channel?
+    return if conversation.contact.email.blank?
 
     true
   end
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index eca35c466..587dfd71c 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -34,36 +34,43 @@ if resource.web_widget?
   json.hmac_token resource.channel.try(:hmac_token)
   json.pre_chat_form_enabled resource.channel.try(:pre_chat_form_enabled)
   json.pre_chat_form_options resource.channel.try(:pre_chat_form_options)
+  json.continuity_via_email resource.channel.try(:continuity_via_email)
 end
 
 ## Facebook Attributes
-json.page_id resource.channel.try(:page_id)
-json.reauthorization_required resource.channel.try(:reauthorization_required?) if resource.facebook?
+if resource.facebook?
+  json.page_id resource.channel.try(:page_id)
+  json.reauthorization_required resource.channel.try(:reauthorization_required?)
+end
 
 ## Twilio Attributes
 json.phone_number resource.channel.try(:phone_number)
 json.medium resource.channel.try(:medium) if resource.twilio?
 
-## Email Channel Attributes
-json.forward_to_email resource.channel.try(:forward_to_email)
-json.email resource.channel.try(:email) if resource.email?
+if resource.email?
+  ## Email Channel Attributes
+  json.forward_to_email resource.channel.try(:forward_to_email)
+  json.email resource.channel.try(:email)
 
-## IMAP
-json.imap_email resource.channel.try(:imap_email) if resource.email?
-json.imap_password resource.channel.try(:imap_password) if resource.email?
-json.imap_address resource.channel.try(:imap_address) if resource.email?
-json.imap_port resource.channel.try(:imap_port) if resource.email?
-json.imap_enabled resource.channel.try(:imap_enabled) if resource.email?
-json.imap_enable_ssl resource.channel.try(:imap_enable_ssl) if resource.email?
+  ## IMAP
+  json.imap_email resource.channel.try(:imap_email)
+  json.imap_password resource.channel.try(:imap_password)
+  json.imap_address resource.channel.try(:imap_address)
+  json.imap_port resource.channel.try(:imap_port)
+  json.imap_enabled resource.channel.try(:imap_enabled)
+  json.imap_enable_ssl resource.channel.try(:imap_enable_ssl)
 
-## SMTP
-json.smtp_email resource.channel.try(:smtp_email) if resource.email?
-json.smtp_password resource.channel.try(:smtp_password) if resource.email?
-json.smtp_address resource.channel.try(:smtp_address) if resource.email?
-json.smtp_port resource.channel.try(:smtp_port) if resource.email?
-json.smtp_enabled resource.channel.try(:smtp_enabled) if resource.email?
-json.smtp_domain resource.channel.try(:smtp_domain) if resource.email?
+  ## SMTP
+  json.smtp_email resource.channel.try(:smtp_email)
+  json.smtp_password resource.channel.try(:smtp_password)
+  json.smtp_address resource.channel.try(:smtp_address)
+  json.smtp_port resource.channel.try(:smtp_port)
+  json.smtp_enabled resource.channel.try(:smtp_enabled)
+  json.smtp_domain resource.channel.try(:smtp_domain)
+end
 
 ## API Channel Attributes
-json.webhook_url resource.channel.try(:webhook_url) if resource.api?
-json.inbox_identifier resource.channel.try(:identifier) if resource.api?
+if resource.api?
+  json.webhook_url resource.channel.try(:webhook_url)
+  json.inbox_identifier resource.channel.try(:identifier)
+end
diff --git a/config/routes.rb b/config/routes.rb
index 880f8bdcc..49e7bf059 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -305,11 +305,11 @@ Rails.application.routes.draw do
       resources :users, only: [:index, :new, :create, :show, :edit, :update]
       resources :access_tokens, only: [:index, :show]
       resources :installation_configs, only: [:index, :new, :create, :show, :edit, :update]
+      resources :agent_bots, only: [:index, :new, :create, :show, :edit, :update]
+      resources :platform_apps, only: [:index, :new, :create, :show, :edit, :update]
 
       # resources that doesn't appear in primary navigation in super admin
       resources :account_users, only: [:new, :create, :destroy]
-      resources :agent_bots, only: [:index, :new, :create, :show, :edit, :update]
-      resources :platform_apps, only: [:index, :new, :create, :show, :edit, :update]
     end
     authenticated :super_admin do
       mount Sidekiq::Web => '/monitoring/sidekiq'
diff --git a/db/migrate/20220119051739_enable_conversation_continuity.rb b/db/migrate/20220119051739_enable_conversation_continuity.rb
new file mode 100644
index 000000000..0deb5f0d6
--- /dev/null
+++ b/db/migrate/20220119051739_enable_conversation_continuity.rb
@@ -0,0 +1,5 @@
+class EnableConversationContinuity < ActiveRecord::Migration[6.1]
+  def change
+    add_column :channel_web_widgets, :continuity_via_email, :boolean, null: false, default: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8dc74b602..b963cae8d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -274,6 +274,7 @@ ActiveRecord::Schema.define(version: 2022_01_21_055444) do
     t.boolean "pre_chat_form_enabled", default: false
     t.jsonb "pre_chat_form_options", default: {}
     t.boolean "hmac_mandatory", default: false
+    t.boolean "continuity_via_email", default: true, null: false
     t.index ["hmac_token"], name: "index_channel_web_widgets_on_hmac_token", unique: true
     t.index ["website_token"], name: "index_channel_web_widgets_on_website_token", unique: true
   end
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index bc8d79ac5..42fcbf49f 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -56,33 +56,44 @@ RSpec.describe Message, type: :model do
       expect(hook_execution_service).to have_received(:perform)
     end
 
-    it 'calls notify email method on after save for outgoing messages' do
-      allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)
-      message.message_type = 'outgoing'
-      message.save!
-      expect(ConversationReplyEmailWorker).to have_received(:perform_in)
-    end
+    context 'with conversation continuity' do
+      it 'calls notify email method on after save for outgoing messages in website channel' do
+        allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)
+        message.message_type = 'outgoing'
+        message.save!
+        expect(ConversationReplyEmailWorker).to have_received(:perform_in)
+      end
 
-    it 'wont call notify email method for private notes' do
-      message.private = true
-      allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)
-      message.save!
-      expect(ConversationReplyEmailWorker).not_to have_received(:perform_in)
-    end
+      it 'does not call notify email for website channel if continuity is disabled' do
+        message.inbox = create(:inbox, account: message.account,
+                                       channel: build(:channel_widget, account: message.account, continuity_via_email: false))
+        allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)
+        message.message_type = 'outgoing'
+        message.save!
+        expect(ConversationReplyEmailWorker).not_to have_received(:perform_in)
+      end
 
-    it 'calls EmailReply worker if the channel is email' do
-      message.inbox = create(:inbox, account: message.account, channel: build(:channel_email, account: message.account))
-      allow(EmailReplyWorker).to receive(:perform_in).and_return(true)
-      message.message_type = 'outgoing'
-      message.save!
-      expect(EmailReplyWorker).to have_received(:perform_in).with(1.second, message.id)
-    end
+      it 'wont call notify email method for private notes' do
+        message.private = true
+        allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)
+        message.save!
+        expect(ConversationReplyEmailWorker).not_to have_received(:perform_in)
+      end
 
-    it 'wont call notify email method unless its website or email channel' do
-      message.inbox = create(:inbox, account: message.account, channel: build(:channel_api, account: message.account))
-      allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)
-      message.save!
-      expect(ConversationReplyEmailWorker).not_to have_received(:perform_in)
+      it 'calls EmailReply worker if the channel is email' do
+        message.inbox = create(:inbox, account: message.account, channel: build(:channel_email, account: message.account))
+        allow(EmailReplyWorker).to receive(:perform_in).and_return(true)
+        message.message_type = 'outgoing'
+        message.save!
+        expect(EmailReplyWorker).to have_received(:perform_in).with(1.second, message.id)
+      end
+
+      it 'wont call notify email method unless its website or email channel' do
+        message.inbox = create(:inbox, account: message.account, channel: build(:channel_api, account: message.account))
+        allow(ConversationReplyEmailWorker).to receive(:perform_in).and_return(true)
+        message.save!
+        expect(ConversationReplyEmailWorker).not_to have_received(:perform_in)
+      end
     end
   end
 

From 8e6d8e765476a08893dabafbb77746f929a12910 Mon Sep 17 00:00:00 2001
From: Shivam Chahar <chahar.shivam@yahoo.com>
Date: Thu, 27 Jan 2022 05:31:41 +0530
Subject: [PATCH 031/101] fix: Validate avatar only when it has changed (#3849)

---
 app/models/concerns/avatarable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb
index 441afa106..b17a0bdbf 100644
--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -6,7 +6,7 @@ module Avatarable
 
   included do
     has_one_attached :avatar
-    validate :acceptable_avatar
+    validate :acceptable_avatar, if: -> { avatar.changed? }
   end
 
   def avatar_url

From 5710b7559e532a436d3e2630c5d1ca7872c648a3 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 26 Jan 2022 17:52:08 -0800
Subject: [PATCH 032/101] fix: Fix email template to render the chat bubble
 properly (#3858)

---
 .../conversation_assignment.liquid            | 32 ++++++++---------
 .../conversation_creation.liquid              | 36 +++++++++----------
 .../conversation_mention.liquid               | 32 ++++++++---------
 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
index 18cd21e75..d59672dc8 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assignment.liquid
@@ -4,25 +4,25 @@
 
 {% for chat_message in conversation.recent_messages %}
   <div>
-    {% if chat_message.sender == user.available_name %}
-      <h4 style="margin: 0;">You</h4>
-    {% else %}
-      <h4 style="margin: 0;">{{chat_message.sender}}</h4>
-    {% endif %}
+    <h4 style="margin: 0;">
+      {% if chat_message.sender == user.available_name %}
+        You
+      {% else %}
+        {{chat_message.sender}}
+      {% endif %}
+    </h4>
   </div>
 
-  <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
-      {% if chat_message.content %}
-        {{chat_message.content}}
-      {% endif %}
+  <div style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    {% if chat_message.content %}
+      {{chat_message.content}}
+    {% endif %}
 
-      {% if chat_message.attachments %}
-        {% for attachment in chat_message.attachments %}
-          Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
-        {% endfor %}
-      {% endif %}
-    </p>
+    {% if chat_message.attachments %}
+      {% for attachment in chat_message.attachments %}
+        Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
+      {% endfor %}
+    {% endif %}
   </div>
 {% endfor %}
 
diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
index d7dac7cca..e2d952777 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_creation.liquid
@@ -7,24 +7,24 @@
 
 {% for chat_message in conversation.recent_messages %}
   <div>
-    {% if chat_message.sender == user.available_name %}
-      <h4 style="margin: 0;">You</h4>
-    {% else %}
-      <h4 style="margin: 0;">{{chat_message.sender}}</h4>
+    <h4 style="margin: 0;">
+      {% if chat_message.sender == user.available_name %}
+        You
+      {% else %}
+        {{chat_message.sender}}
+      {% endif %}
+    </h4>
+  </div>
+
+  <div style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    {% if chat_message.content %}
+      {{chat_message.content}}
+    {% endif %}
+
+    {% if chat_message.attachments %}
+      {% for attachment in chat_message.attachments %}
+        Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
+      {% endfor %}
     {% endif %}
   </div>
-
-  <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
-      {% if chat_message.content %}
-        {{chat_message.content}}
-      {% endif %}
-
-      {% if chat_message.attachments %}
-        {% for attachment in chat_message.attachments %}
-          Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
-        {% endfor %}
-      {% endif %}
-    </p>
-  </div>
 {% endfor %}
diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid
index 00cb13e1e..193c0c015 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_mention.liquid
@@ -8,25 +8,25 @@
 <p><b>Previous messages:</b></p>
 {% for chat_message in conversation.recent_messages %}
   <div>
-    {% if chat_message.sender == user.available_name %}
-      <h4 style="margin: 0;">You</h4>
-    {% else %}
-      <h4 style="margin: 0;">{{chat_message.sender}}</h4>
-    {% endif %}
+    <h4 style="margin: 0;">
+      {% if chat_message.sender == user.available_name %}
+        You
+      {% else %}
+        {{chat_message.sender}}
+      {% endif %}
+    </h4>
   </div>
 
-  <div>
-    <p style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; text-align: start; unicode-bidi: plaintext;">
-      {% if chat_message.content %}
-        {{chat_message.content}}
-      {% endif %}
+  <div style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+    {% if chat_message.content %}
+      {{chat_message.content}}
+    {% endif %}
 
-      {% if chat_message.attachments %}
-        {% for attachment in chat_message.attachments %}
-          Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
-        {% endfor %}
-      {% endif %}
-    </p>
+    {% if chat_message.attachments %}
+      {% for attachment in chat_message.attachments %}
+        Attachment [<a href="{{ attachment }}" _target="blank">Click here to view</a>]
+      {% endfor %}
+    {% endif %}
   </div>
 {% endfor %}
 <p>

From cd6c9a8fe9592f2f0a47184f38f8b535d8f9ffbb Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 27 Jan 2022 08:26:12 +0530
Subject: [PATCH 033/101] enhancement: Custom views (#3838)

* enhancement: Custom views

* Review fixes
---
 .../dashboard/components/ChatList.vue         | 130 ++++++++------
 .../layout/config/sidebarItems/contacts.js    |   2 +-
 .../config/sidebarItems/conversations.js      |   4 +-
 .../layout/sidebarComponents/Secondary.vue    |  14 +-
 .../widgets/conversation/ConversationCard.vue |   4 +-
 app/javascript/dashboard/helper/URLHelper.js  |   6 +-
 .../i18n/locale/en/advancedFilters.json       |  20 ++-
 .../contacts/components/ContactsView.vue      | 164 ++++++++++++------
 .../dashboard/contacts/components/Header.vue  |  22 ++-
 .../routes/dashboard/contacts/routes.js       |   4 +-
 .../conversation/ConversationView.vue         |   4 +-
 .../conversation/conversation.routes.js       |   8 +-
 .../dashboard/customviews/AddCustomViews.vue  |  16 +-
 .../customviews/DeleteCustomViews.vue         |  22 ++-
 14 files changed, 251 insertions(+), 169 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 03e5b68bc..4b951a705 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -3,7 +3,7 @@
     <slot></slot>
     <div
       class="chat-list__top"
-      :class="{ filter__applied: hasAppliedFiltersOrActiveCustomViews }"
+      :class="{ filter__applied: hasAppliedFiltersOrActiveFolders }"
     >
       <h1 class="page-title text-truncate" :title="pageTitle">
         {{ pageTitle }}
@@ -11,17 +11,17 @@
 
       <div class="filter--actions">
         <chat-filter
-          v-if="!hasAppliedFiltersOrActiveCustomViews"
+          v-if="!hasAppliedFiltersOrActiveFolders"
           @statusFilterChange="updateStatusType"
         />
-        <div v-if="hasAppliedFilters && !hasActiveCustomViews">
+        <div v-if="hasAppliedFilters && !hasActiveFolders">
           <woot-button
             v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.ADD.SAVE_BUTTON')"
             size="tiny"
             variant="smooth"
             color-scheme="secondary"
             icon="save"
-            @click="onClickOpenAddCustomViewsModal"
+            @click="onClickOpenAddFoldersModal"
           />
           <woot-button
             v-tooltip.top-end="$t('FILTER.CLEAR_BUTTON_LABEL')"
@@ -32,7 +32,7 @@
             @click="resetAndFetchData"
           />
         </div>
-        <div v-if="hasActiveCustomViews">
+        <div v-if="hasActiveFolders">
           <woot-button
             v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.DELETE.DELETE_BUTTON')"
             size="tiny"
@@ -40,7 +40,7 @@
             color-scheme="alert"
             icon="delete"
             class="delete-custom-view__button"
-            @click="onClickOpenDeleteCustomViewsModal"
+            @click="onClickOpenDeleteFoldersModal"
           />
         </div>
 
@@ -59,21 +59,23 @@
     </div>
 
     <add-custom-views
-      v-if="showAddCustomViewsModal"
-      :custom-views-query="customViewsQuery"
-      @close="onCloseAddCustomViewsModal"
+      v-if="showAddFoldersModal"
+      :custom-views-query="foldersQuery"
+      :open-last-saved-item="openLastSavedItemInFolder"
+      @close="onCloseAddFoldersModal"
     />
 
     <delete-custom-views
-      v-if="showDeleteCustomViewsModal"
-      :show-delete-popup.sync="showDeleteCustomViewsModal"
-      :active-custom-view="activeCustomView"
-      :custom-views-id="customViewsId"
-      @close="onCloseDeleteCustomViewsModal"
+      v-if="showDeleteFoldersModal"
+      :show-delete-popup.sync="showDeleteFoldersModal"
+      :active-custom-view="activeFolder"
+      :custom-views-id="foldersId"
+      :open-last-item-after-delete="openLastItemAfterDeleteInFolder"
+      @close="onCloseDeleteFoldersModal"
     />
 
     <chat-type-tabs
-      v-if="!hasAppliedFiltersOrActiveCustomViews"
+      v-if="!hasAppliedFiltersOrActiveFolders"
       :items="assigneeTabItems"
       :active-tab="activeAssigneeTab"
       class="tab--chat-type"
@@ -90,7 +92,7 @@
         :key="chat.id"
         :active-label="label"
         :team-id="teamId"
-        :custom-views-id="customViewsId"
+        :folders-id="foldersId"
         :chat="chat"
         :conversation-type="conversationType"
         :show-assignee="showAssigneeInConversationCard"
@@ -183,7 +185,7 @@ export default {
       type: String,
       default: '',
     },
-    customViewsId: {
+    foldersId: {
       type: [String, Number],
       default: 0,
     },
@@ -197,9 +199,9 @@ export default {
         ...filter,
         attributeName: this.$t(`FILTER.ATTRIBUTES.${filter.attributeI18nKey}`),
       })),
-      customViewsQuery: {},
-      showAddCustomViewsModal: false,
-      showDeleteCustomViewsModal: false,
+      foldersQuery: {},
+      showAddFoldersModal: false,
+      showDeleteFoldersModal: false,
     };
   },
   computed: {
@@ -214,20 +216,20 @@ export default {
       activeInbox: 'getSelectedInbox',
       conversationStats: 'conversationStats/getStats',
       appliedFilters: 'getAppliedConversationFilters',
-      customViews: 'customViews/getCustomViews',
+      folders: 'customViews/getCustomViews',
     }),
     hasAppliedFilters() {
       return this.appliedFilters.length;
     },
-    hasActiveCustomViews() {
-      return this.activeCustomView && this.customViewsId !== 0;
+    hasActiveFolders() {
+      return this.activeFolder && this.foldersId !== 0;
     },
-    hasAppliedFiltersOrActiveCustomViews() {
-      return this.hasAppliedFilters || this.hasActiveCustomViews;
+    hasAppliedFiltersOrActiveFolders() {
+      return this.hasAppliedFilters || this.hasActiveFolders;
     },
-    savedCustomViewsValue() {
-      if (this.hasActiveCustomViews) {
-        const payload = this.activeCustomView.query;
+    savedFoldersValue() {
+      if (this.hasActiveFolders) {
+        const payload = this.activeFolder.query;
         this.fetchSavedFilteredConversations(payload);
       }
       return {};
@@ -254,7 +256,7 @@ export default {
       );
     },
     currentPageFilterKey() {
-      return this.hasAppliedFiltersOrActiveCustomViews
+      return this.hasAppliedFiltersOrActiveFolders
         ? 'appliedFilters'
         : this.activeAssigneeTab;
     },
@@ -279,9 +281,7 @@ export default {
         conversationType: this.conversationType
           ? this.conversationType
           : undefined,
-        customViews: this.hasActiveCustomViews
-          ? this.savedCustomViewsValue
-          : undefined,
+        folders: this.hasActiveFolders ? this.savedFoldersValue : undefined,
       };
     },
     pageTitle() {
@@ -297,14 +297,14 @@ export default {
       if (this.conversationType === 'mention') {
         return this.$t('CHAT_LIST.MENTION_HEADING');
       }
-      if (this.hasActiveCustomViews) {
-        return this.activeCustomView.name;
+      if (this.hasActiveFolders) {
+        return this.activeFolder.name;
       }
       return this.$t('CHAT_LIST.TAB_HEADING');
     },
     conversationList() {
       let conversationList = [];
-      if (!this.hasAppliedFiltersOrActiveCustomViews) {
+      if (!this.hasAppliedFiltersOrActiveFolders) {
         const filters = this.conversationFilters;
         if (this.activeAssigneeTab === 'me') {
           conversationList = [...this.mineChatsList(filters)];
@@ -319,10 +319,10 @@ export default {
 
       return conversationList;
     },
-    activeCustomView() {
-      if (this.customViewsId) {
-        const activeView = this.customViews.filter(
-          view => view.id === Number(this.customViewsId)
+    activeFolder() {
+      if (this.foldersId) {
+        const activeView = this.folders.filter(
+          view => view.id === Number(this.foldersId)
         );
         const [firstValue] = activeView;
         return firstValue;
@@ -349,8 +349,10 @@ export default {
     conversationType() {
       this.resetAndFetchData();
     },
-    activeCustomView() {
-      this.resetAndFetchData();
+    activeFolder() {
+      if (!this.hasAppliedFilters) {
+        this.resetAndFetchData();
+      }
     },
   },
   mounted() {
@@ -366,22 +368,22 @@ export default {
       if (this.$route.name !== 'home') {
         this.$router.push({ name: 'home' });
       }
-      this.customViewsQuery = { payload: payload };
+      this.foldersQuery = { payload: payload };
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
       this.fetchFilteredConversations(payload);
     },
-    onClickOpenAddCustomViewsModal() {
-      this.showAddCustomViewsModal = true;
+    onClickOpenAddFoldersModal() {
+      this.showAddFoldersModal = true;
     },
-    onCloseAddCustomViewsModal() {
-      this.showAddCustomViewsModal = false;
+    onCloseAddFoldersModal() {
+      this.showAddFoldersModal = false;
     },
-    onClickOpenDeleteCustomViewsModal() {
-      this.showDeleteCustomViewsModal = true;
+    onClickOpenDeleteFoldersModal() {
+      this.showDeleteFoldersModal = true;
     },
-    onCloseDeleteCustomViewsModal() {
-      this.showDeleteCustomViewsModal = false;
+    onCloseDeleteFoldersModal() {
+      this.showDeleteFoldersModal = false;
     },
     onToggleAdvanceFiltersModal() {
       this.showAdvancedFilters = !this.showAdvancedFilters;
@@ -434,11 +436,11 @@ export default {
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
       this.$store.dispatch('clearConversationFilters');
-      if (this.hasActiveCustomViews) {
-        const payload = this.activeCustomView.query;
+      if (this.hasActiveFolders) {
+        const payload = this.activeFolder.query;
         this.fetchSavedFilteredConversations(payload);
       }
-      if (this.customViewsId) {
+      if (this.foldersId) {
         return;
       }
       this.fetchConversations();
@@ -449,11 +451,11 @@ export default {
         .then(() => this.$emit('conversation-load'));
     },
     loadMoreConversations() {
-      if (!this.hasAppliedFiltersOrActiveCustomViews) {
+      if (!this.hasAppliedFiltersOrActiveFolders) {
         this.fetchConversations();
       }
-      if (this.hasActiveCustomViews) {
-        const payload = this.activeCustomView.query;
+      if (this.hasActiveFolders) {
+        const payload = this.activeFolder.query;
         this.fetchSavedFilteredConversations(payload);
       } else {
         this.fetchFilteredConversations(this.appliedFilters);
@@ -493,6 +495,22 @@ export default {
         this.resetAndFetchData();
       }
     },
+    openLastSavedItemInFolder() {
+      const lastItemOfFolder = this.folders[this.folders.length - 1];
+      const lastItemId = lastItemOfFolder.id;
+      this.$router.push({
+        name: 'folder_conversations',
+        params: { id: lastItemId },
+      });
+    },
+    openLastItemAfterDeleteInFolder() {
+      if (this.folders.length > 0) {
+        this.openLastSavedItemInFolder();
+      } else {
+        this.$router.push({ name: 'home' });
+        this.fetchConversations();
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js b/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
index 723b3fbdf..d615bd15c 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/contacts.js
@@ -5,7 +5,7 @@ const contacts = accountId => ({
   routes: [
     'contacts_dashboard',
     'contact_profile_dashboard',
-    'contacts_through_custom_view',
+    'contacts_segments_dashboard',
     'contacts_labels_dashboard',
   ],
   menuItems: [
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js b/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js
index c19cc1846..596fdd8d1 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js
@@ -14,8 +14,8 @@ const conversations = accountId => ({
     'conversations_through_team',
     'conversation_mentions',
     'conversation_through_mentions',
-    'custom_view_conversations',
-    'conversations_through_custom_view',
+    'folder_conversations',
+    'conversations_through_folders',
   ],
   menuItems: [
     {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 9c41f9946..da14cf295 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -157,7 +157,7 @@ export default {
         })),
       };
     },
-    customViewsSection() {
+    foldersSection() {
       return {
         icon: 'folder',
         label: 'CUSTOM_VIEWS_FOLDER',
@@ -175,7 +175,7 @@ export default {
           })),
       };
     },
-    contactCustomViewsSection() {
+    contactSegmentsSection() {
       return {
         icon: 'folder',
         label: 'CUSTOM_VIEWS_SEGMENTS',
@@ -200,16 +200,10 @@ export default {
         conversationMenuItems = [this.teamSection, ...conversationMenuItems];
       }
       if (this.customViews.length) {
-        conversationMenuItems = [
-          this.customViewsSection,
-          ...conversationMenuItems,
-        ];
+        conversationMenuItems = [this.foldersSection, ...conversationMenuItems];
       }
       if (this.contactCustomViews.length) {
-        contactMenuItems = [
-          this.contactCustomViewsSection,
-          ...contactMenuItems,
-        ];
+        contactMenuItems = [this.contactSegmentsSection, ...contactMenuItems];
       }
       return {
         conversations: conversationMenuItems,
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 3e509eb9f..dc8cae554 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -130,7 +130,7 @@ export default {
       type: [String, Number],
       default: 0,
     },
-    customViewsId: {
+    foldersId: {
       type: [String, Number],
       default: 0,
     },
@@ -252,7 +252,7 @@ export default {
         id: chat.id,
         label: this.activeLabel,
         teamId: this.teamId,
-        customViewsId: this.customViewsId,
+        foldersId: this.foldersId,
         conversationType: this.conversationType,
       });
       router.push({ path: frontendURL(path) });
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index 120d6f2de..503b98f8e 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -12,7 +12,7 @@ export const conversationUrl = ({
   label,
   teamId,
   conversationType = '',
-  customViewsId,
+  foldersId,
 }) => {
   let url = `accounts/${accountId}/conversations/${id}`;
   if (activeInbox) {
@@ -21,8 +21,8 @@ export const conversationUrl = ({
     url = `accounts/${accountId}/label/${label}/conversations/${id}`;
   } else if (teamId) {
     url = `accounts/${accountId}/team/${teamId}/conversations/${id}`;
-  } else if (customViewsId && customViewsId !== 0) {
-    url = `accounts/${accountId}/custom_view/${customViewsId}/conversations/${id}`;
+  } else if (foldersId && foldersId !== 0) {
+    url = `accounts/${accountId}/custom_view/${foldersId}/conversations/${id}`;
   } else if (conversationType === 'mention') {
     url = `accounts/${accountId}/mentions/conversations/${id}`;
   }
diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index 492c27620..5ab31027a 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -41,9 +41,13 @@
         "ERROR_MESSAGE": "Name is required",
         "SAVE_BUTTON": "Save filter",
         "CANCEL_BUTTON": "Cancel",
-        "API": {
-          "SUCCESS_MESSAGE": "Custom view created successfully",
-          "ERROR_MESSAGE": "Error while creating custom view"
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
         }
       },
       "DELETE": {
@@ -56,9 +60,13 @@
             "NO": "No, Keep it"
           }
         },
-        "API": {
-          "SUCCESS_MESSAGE": "Custom view deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting custom view"
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
         }
       }
     }
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index 39bc16b08..b0801935f 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -3,7 +3,7 @@
     <div class="left-wrap" :class="wrapClas">
       <contacts-header
         :search-query="searchQuery"
-        :custom-views-id="customViewsId"
+        :segments-id="segmentsId"
         :on-search-submit="onSearchSubmit"
         this-selected-contact-id=""
         :on-input-search="onInputSearch"
@@ -31,18 +31,20 @@
     </div>
 
     <add-custom-views
-      v-if="showAddCustomViewsModal"
-      :custom-views-query="customViewsQuery"
+      v-if="showAddSegmentsModal"
+      :custom-views-query="segmentsQuery"
       :filter-type="filterType"
-      @close="onCloseAddCustomViewsModal"
+      :open-last-saved-item="openSavedItemInSegment"
+      @close="onCloseAddSegmentsModal"
     />
     <delete-custom-views
-      v-if="showDeleteCustomViewsModal"
-      :show-delete-popup.sync="showDeleteCustomViewsModal"
-      :active-custom-view="activeCustomView"
-      :custom-views-id="customViewsId"
+      v-if="showDeleteSegmentsModal"
+      :show-delete-popup.sync="showDeleteSegmentsModal"
+      :active-custom-view="activeSegment"
+      :custom-views-id="segmentsId"
       :active-filter-type="filterType"
-      @close="onCloseDeleteCustomViewsModal"
+      :open-last-item-after-delete="openLastItemAfterDeleteInSegment"
+      @close="onCloseDeleteSegmentsModal"
     />
 
     <contact-info-panel
@@ -102,7 +104,7 @@ export default {
   },
   props: {
     label: { type: String, default: '' },
-    customViewsId: {
+    segmentsId: {
       type: [String, Number],
       default: 0,
     },
@@ -121,10 +123,10 @@ export default {
           `CONTACTS_FILTER.ATTRIBUTES.${filter.attributeI18nKey}`
         ),
       })),
-      customViewsQuery: {},
+      segmentsQuery: {},
       filterType: FILTER_TYPE_CONTACT,
-      showAddCustomViewsModal: false,
-      showDeleteCustomViewsModal: false,
+      showAddSegmentsModal: false,
+      showDeleteSegmentsModal: false,
     };
   },
   computed: {
@@ -132,7 +134,7 @@ export default {
       records: 'contacts/getContacts',
       uiFlags: 'contacts/getUIFlags',
       meta: 'contacts/getMeta',
-      customViews: 'customViews/getCustomViews',
+      segments: 'customViews/getCustomViews',
       getAppliedContactFilters: 'contacts/getAppliedContactFilters',
     }),
     showEmptySearchResult() {
@@ -142,12 +144,18 @@ export default {
     hasAppliedFilters() {
       return this.getAppliedContactFilters.length;
     },
-    hasActiveCustomViews() {
-      return this.activeCustomView && this.customViewsId !== 0;
+    hasActiveSegments() {
+      return this.activeSegment && this.segmentsId !== 0;
+    },
+    isContactAndLabelDashboard() {
+      return (
+        this.$route.name === 'contacts_dashboard' ||
+        this.$route.name === 'contacts_labels_dashboard'
+      );
     },
     pageTitle() {
-      if (this.hasActiveCustomViews) {
-        return this.activeCustomView.name;
+      if (this.hasActiveSegments) {
+        return this.activeSegment.name;
       }
       if (this.label) {
         return `#${this.label}`;
@@ -176,10 +184,10 @@ export default {
         ? selectedPageNumber
         : DEFAULT_PAGE;
     },
-    activeCustomView() {
-      if (this.customViewsId) {
-        const [firstValue] = this.customViews.filter(
-          view => view.id === Number(this.customViewsId)
+    activeSegment() {
+      if (this.segmentsId) {
+        const [firstValue] = this.segments.filter(
+          view => view.id === Number(this.segmentsId)
         );
         return firstValue;
       }
@@ -189,11 +197,17 @@ export default {
   watch: {
     label() {
       this.fetchContacts(DEFAULT_PAGE);
+      if (this.hasAppliedFilters) {
+        this.clearFilters();
+      }
     },
-    activeCustomView() {
-      if (this.hasActiveCustomViews) {
-        const payload = this.activeCustomView.query;
-        this.fetchSavedFilteredContact(payload);
+    activeSegment() {
+      if (this.hasActiveSegments) {
+        const payload = this.activeSegment.query;
+        this.fetchSavedFilteredContact(payload, DEFAULT_PAGE);
+      }
+      if (this.hasAppliedFilters && this.$route.name === 'contacts_dashboard') {
+        this.fetchFilteredContacts(DEFAULT_PAGE);
       } else {
         this.fetchContacts(DEFAULT_PAGE);
       }
@@ -222,35 +236,49 @@ export default {
       return sortAttr;
     },
     fetchContacts(page) {
-      this.updatePageParam(page);
-      let value = '';
-      if (this.searchQuery.charAt(0) === '+') {
-        value = this.searchQuery.substring(1);
-      } else {
-        value = this.searchQuery;
+      if (this.isContactAndLabelDashboard) {
+        this.updatePageParam(page);
+        let value = '';
+        if (this.searchQuery.charAt(0) === '+') {
+          value = this.searchQuery.substring(1);
+        } else {
+          value = this.searchQuery;
+        }
+        const requestParams = {
+          page,
+          sortAttr: this.getSortAttribute(),
+          label: this.label,
+        };
+        if (!value) {
+          this.$store.dispatch('contacts/get', requestParams);
+        } else {
+          this.$store.dispatch('contacts/search', {
+            search: value,
+            ...requestParams,
+          });
+        }
       }
-      const requestParams = {
-        page,
-        sortAttr: this.getSortAttribute(),
-        label: this.label,
-      };
-      if (!value) {
-        this.$store.dispatch('contacts/get', requestParams);
-      } else {
-        this.$store.dispatch('contacts/search', {
-          search: value,
-          ...requestParams,
+    },
+    fetchSavedFilteredContact(payload, page) {
+      if (this.hasActiveSegments) {
+        this.updatePageParam(page);
+        this.$store.dispatch('contacts/filter', {
+          queryPayload: payload,
+          page,
         });
       }
     },
-    fetchSavedFilteredContact(payload) {
+    fetchFilteredContacts(page) {
       if (this.hasAppliedFilters) {
-        this.clearFilters();
+        const payload = this.segmentsQuery;
+        this.updatePageParam(page);
+        this.$store.dispatch('contacts/filter', {
+          queryPayload: payload,
+          page,
+        });
       }
-      this.$store.dispatch('contacts/filter', {
-        queryPayload: payload,
-      });
     },
+
     onInputSearch(event) {
       const newQuery = event.target.value;
       const refetchAllContacts = !!this.searchQuery && newQuery === '';
@@ -267,7 +295,15 @@ export default {
     },
     onPageChange(page) {
       this.selectedContactId = '';
-      this.fetchContacts(page);
+      if (this.segmentsId !== 0) {
+        const payload = this.activeSegment.query;
+        this.fetchSavedFilteredContact(payload, page);
+      }
+      if (this.hasAppliedFilters) {
+        this.fetchFilteredContacts(page);
+      } else {
+        this.fetchContacts(page);
+      }
     },
     openContactInfoPanel(contactId) {
       this.selectedContactId = contactId;
@@ -281,16 +317,16 @@ export default {
       this.showCreateModal = !this.showCreateModal;
     },
     onToggleSaveFilters() {
-      this.showAddCustomViewsModal = true;
+      this.showAddSegmentsModal = true;
     },
-    onCloseAddCustomViewsModal() {
-      this.showAddCustomViewsModal = false;
+    onCloseAddSegmentsModal() {
+      this.showAddSegmentsModal = false;
     },
     onToggleDeleteFilters() {
-      this.showDeleteCustomViewsModal = true;
+      this.showDeleteSegmentsModal = true;
     },
-    onCloseDeleteCustomViewsModal() {
-      this.showDeleteCustomViewsModal = false;
+    onCloseDeleteSegmentsModal() {
+      this.showDeleteSegmentsModal = false;
     },
     onToggleImport() {
       this.showImportModal = !this.showImportModal;
@@ -304,7 +340,7 @@ export default {
     },
     onApplyFilter(payload) {
       this.closeContactInfoPanel();
-      this.customViewsQuery = { payload };
+      this.segmentsQuery = { payload };
       this.$store.dispatch('contacts/filter', {
         queryPayload: filterQueryGenerator(payload),
       });
@@ -314,6 +350,22 @@ export default {
       this.$store.dispatch('contacts/clearContactFilters');
       this.fetchContacts(this.pageParameter);
     },
+    openSavedItemInSegment() {
+      const lastItemInSegments = this.segments[this.segments.length - 1];
+      const lastItemId = lastItemInSegments.id;
+      this.$router.push({
+        name: 'contacts_segments_dashboard',
+        params: { id: lastItemId },
+      });
+    },
+    openLastItemAfterDeleteInSegment() {
+      if (this.segments.length > 0) {
+        this.openSavedItemInSegment();
+      } else {
+        this.$router.push({ name: 'contacts_dashboard' });
+        this.fetchContacts(DEFAULT_PAGE);
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 3006f43ca..9a9e670b1 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -26,18 +26,16 @@
             {{ $t('CONTACTS_PAGE.SEARCH_BUTTON') }}
           </woot-button>
         </div>
-
         <woot-button
-          v-if="hasActiveCustomViews && !hasAppliedFilters"
+          v-if="hasActiveSegments"
           class="margin-right-small clear"
           color-scheme="alert"
           icon="delete"
-          @click="onToggleDeleteCustomViewsModal"
+          @click="onToggleDeleteSegmentsModal"
         >
           {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_DELETE') }}
         </woot-button>
-
-        <div v-if="!hasActiveCustomViews" class="filters__button-wrap">
+        <div v-if="!hasActiveSegments" class="filters__button-wrap">
           <div v-if="hasAppliedFilters" class="filters__applied-indicator" />
           <woot-button
             class="margin-right-small clear"
@@ -51,12 +49,12 @@
         </div>
 
         <woot-button
-          v-if="hasAppliedFilters && !hasActiveCustomViews"
+          v-if="hasAppliedFilters && !hasActiveSegments"
           class="margin-right-small clear"
           color-scheme="alert"
           variant="clear"
           icon="save"
-          @click="onToggleCustomViewsModal"
+          @click="onToggleSegmentsModal"
         >
           {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_SAVE') }}
         </woot-button>
@@ -96,7 +94,7 @@ export default {
       type: String,
       default: '',
     },
-    customViewsId: {
+    segmentsId: {
       type: [String, Number],
       default: 0,
     },
@@ -137,15 +135,15 @@ export default {
     hasAppliedFilters() {
       return this.getAppliedContactFilters.length;
     },
-    hasActiveCustomViews() {
-      return this.customViewsId !== 0;
+    hasActiveSegments() {
+      return this.segmentsId !== 0;
     },
   },
   methods: {
-    onToggleCustomViewsModal() {
+    onToggleSegmentsModal() {
       this.$emit('on-toggle-save-filter');
     },
-    onToggleDeleteCustomViewsModal() {
+    onToggleDeleteSegmentsModal() {
       this.$emit('on-toggle-delete-filter');
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/routes.js b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
index 0901489bf..9734c88e2 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/routes.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/routes.js
@@ -12,11 +12,11 @@ export const routes = [
   },
   {
     path: frontendURL('accounts/:accountId/contacts/custom_view/:id'),
-    name: 'contacts_through_custom_view',
+    name: 'contacts_segments_dashboard',
     roles: ['administrator', 'agent'],
     component: ContactsView,
     props: route => {
-      return { customViewsId: route.params.id };
+      return { segmentsId: route.params.id };
     },
   },
   {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index b1a88223d..7c34b4fb1 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -5,7 +5,7 @@
       :label="label"
       :team-id="teamId"
       :conversation-type="conversationType"
-      :custom-views-id="customViewsId"
+      :folders-id="foldersId"
       @conversation-load="onConversationLoad"
     >
       <pop-over-search />
@@ -55,7 +55,7 @@ export default {
       type: String,
       default: '',
     },
-    customViewsId: {
+    foldersId: {
       type: [String, Number],
       default: 0,
     },
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
index 45e05b489..ebd219a2f 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
@@ -85,21 +85,21 @@ export default {
     },
     {
       path: frontendURL('accounts/:accountId/custom_view/:id'),
-      name: 'custom_view_conversations',
+      name: 'folder_conversations',
       roles: ['administrator', 'agent'],
       component: ConversationView,
-      props: route => ({ customViewsId: route.params.id }),
+      props: route => ({ foldersId: route.params.id }),
     },
     {
       path: frontendURL(
         'accounts/:accountId/custom_view/:id/conversations/:conversation_id'
       ),
-      name: 'conversations_through_custom_view',
+      name: 'conversations_through_folders',
       roles: ['administrator', 'agent'],
       component: ConversationView,
       props: route => ({
         conversationId: route.params.conversation_id,
-        customViewsId: route.params.id,
+        foldersId: route.params.id,
       }),
     },
     {
diff --git a/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue b/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
index 319dbab24..37e532e02 100644
--- a/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
+++ b/app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
@@ -43,6 +43,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    openLastSavedItem: {
+      type: Function,
+      default: () => {},
+    },
   },
 
   data() {
@@ -80,17 +84,21 @@ export default {
           filter_type: this.filterType,
           query: this.customViewsQuery,
         });
-        this.alertMessage = this.$t(
-          'FILTER.CUSTOM_VIEWS.ADD.API.SUCCESS_MESSAGE'
-        );
+        this.alertMessage =
+          this.filterType === 0
+            ? this.$t('FILTER.CUSTOM_VIEWS.ADD.API_FOLDERS.SUCCESS_MESSAGE')
+            : this.$t('FILTER.CUSTOM_VIEWS.ADD.API_SEGMENTS.SUCCESS_MESSAGE');
         this.onClose();
       } catch (error) {
         const errorMessage = error?.message;
         this.alertMessage =
-          errorMessage || this.$t('FILTER.CUSTOM_VIEWS.ADD.API.ERROR_MESSAGE');
+          errorMessage || this.filterType === 0
+            ? this.$t('FILTER.CUSTOM_VIEWS.ADD.API_FOLDERS.ERROR_MESSAGE')
+            : this.$t('FILTER.CUSTOM_VIEWS.ADD.API_SEGMENTS.ERROR_MESSAGE');
       } finally {
         this.showAlert(this.alertMessage);
       }
+      this.openLastSavedItem();
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue b/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
index 6d01e387c..547cdddf4 100644
--- a/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
+++ b/app/javascript/dashboard/routes/dashboard/customviews/DeleteCustomViews.vue
@@ -34,6 +34,10 @@ export default {
       type: Number,
       default: 0,
     },
+    openLastItemAfterDelete: {
+      type: Function,
+      default: () => {},
+    },
   },
 
   computed: {
@@ -75,20 +79,20 @@ export default {
         await this.$store.dispatch('customViews/delete', { id, filterType });
         this.closeDeletePopup();
         this.showAlert(
-          this.$t('FILTER.CUSTOM_VIEWS.DELETE.API.SUCCESS_MESSAGE')
+          this.activeFilterType === 0
+            ? this.$t('FILTER.CUSTOM_VIEWS.DELETE.API_FOLDERS.SUCCESS_MESSAGE')
+            : this.$t('FILTER.CUSTOM_VIEWS.DELETE.API_SEGMENTS.SUCCESS_MESSAGE')
         );
       } catch (error) {
         const errorMessage =
-          error?.response?.message ||
-          this.$t('FILTER.CUSTOM_VIEWS.DELETE.API.ERROR_MESSAGE');
+          error?.response?.message || this.activeFilterType === 0
+            ? this.$t('FILTER.CUSTOM_VIEWS.DELETE.API_FOLDERS.SUCCESS_MESSAGE')
+            : this.$t(
+                'FILTER.CUSTOM_VIEWS.DELETE.API_SEGMENTS.SUCCESS_MESSAGE'
+              );
         this.showAlert(errorMessage);
       }
-      if (this.isFolderSection) {
-        this.$router.push({ name: 'home' });
-      }
-      if (this.isSegmentSection) {
-        this.$router.push({ name: 'contacts_dashboard' });
-      }
+      this.openLastItemAfterDelete();
     },
     closeDeletePopup() {
       this.$emit('close');

From 69eaf3ff7fb88f950d3cb83ae69ceaaf4d3d5c91 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 27 Jan 2022 15:57:22 +0530
Subject: [PATCH 034/101] feat: Activestorage direct upload (#3768)

---
 app/builders/messages/message_builder.rb      |  1 -
 .../api/v1/widget/messages_controller.rb      |  1 -
 app/javascript/dashboard/api/inbox/message.js |  6 +--
 .../components/widgets/AttachmentsPreview.vue |  6 +--
 .../widgets/WootWriter/ReplyBottomPanel.vue   |  9 ++++-
 .../widgets/conversation/ReplyBox.vue         | 34 ++++++++++++++++-
 app/javascript/widget/api/endPoints.js        |  2 +-
 .../widget/components/ChatAttachment.vue      | 38 ++++++++++++++++++-
 package.json                                  |  1 +
 9 files changed, 84 insertions(+), 14 deletions(-)

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index f84e38ca7..2df286f4a 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -31,7 +31,6 @@ class Messages::MessageBuilder
     @attachments.each do |uploaded_attachment|
       @message.attachments.build(
         account_id: @message.account_id,
-        file_type: file_type(uploaded_attachment&.content_type),
         file: uploaded_attachment
       )
     end
diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index 0d9ab6323..a35506d96 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -31,7 +31,6 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
     params[:message][:attachments].each do |uploaded_attachment|
       @message.attachments.new(
         account_id: @message.account_id,
-        file_type: helpers.file_type(uploaded_attachment&.content_type),
         file: uploaded_attachment
       )
     end
diff --git a/app/javascript/dashboard/api/inbox/message.js b/app/javascript/dashboard/api/inbox/message.js
index 22f417052..f3c5e83e9 100644
--- a/app/javascript/dashboard/api/inbox/message.js
+++ b/app/javascript/dashboard/api/inbox/message.js
@@ -14,12 +14,12 @@ export const buildCreatePayload = ({
   let payload;
   if (files && files.length !== 0) {
     payload = new FormData();
-    files.forEach(file => {
-      payload.append('attachments[]', file, file.name);
-    });
     if (message) {
       payload.append('content', message);
     }
+    files.forEach(file => {
+      payload.append('attachments[]', file);
+    });
     payload.append('private', isPrivate);
     payload.append('echo_id', echoId);
     payload.append('cc_emails', ccEmails);
diff --git a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
index d484cbb4f..57797b5f3 100644
--- a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
+++ b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
@@ -7,7 +7,7 @@
     >
       <div class="thumb-wrap">
         <img
-          v-if="isTypeImage(attachment.resource.type)"
+          v-if="isTypeImage(attachment.resource.content_type)"
           class="image-thumb"
           :src="attachment.thumb"
         />
@@ -15,12 +15,12 @@
       </div>
       <div class="file-name-wrap">
         <span class="item">
-          {{ attachment.resource.name }}
+          {{ attachment.resource.filename }}
         </span>
       </div>
       <div class="file-size-wrap">
         <span class="item">
-          {{ formatFileSize(attachment.resource.size) }}
+          {{ formatFileSize(attachment.resource.byte_size) }}
         </span>
       </div>
       <div class="remove-file-wrap">
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 0a9ee3629..f53cfcfc5 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -19,7 +19,8 @@
         :multiple="enableMultipleFileUpload"
         :drop="true"
         :drop-directory="false"
-        @input-file="onFileUpload"
+        :data="{ direct_upload_url: '/rails/active_storage/direct_uploads', direct_upload: true }"
+        @input-file="onDirectFileUpload"
       >
         <woot-button
           v-if="showAttachButton"
@@ -80,6 +81,7 @@
 
 <script>
 import FileUpload from 'vue-upload-component';
+import * as ActiveStorage from "activestorage";
 import {
   hasPressedAltAndWKey,
   hasPressedAltAndAKey,
@@ -109,7 +111,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    onFileUpload: {
+    onDirectFileUpload: {
       type: Function,
       default: () => {},
     },
@@ -150,6 +152,9 @@ export default {
       default: true,
     },
   },
+  mounted() {
+    ActiveStorage.start();
+  },
   computed: {
     isNote() {
       return this.mode === REPLY_EDITOR_MODES.NOTE;
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index d7385a3fd..03019f55e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -61,7 +61,7 @@
     <reply-bottom-panel
       :mode="replyType"
       :send-button-text="replyButtonLabel"
-      :on-file-upload="onFileUpload"
+      :on-direct-file-upload="onDirectFileUpload"
       :show-file-upload="showFileUpload"
       :toggle-emoji-picker="toggleEmojiPicker"
       :show-emoji-picker="showEmojiPicker"
@@ -104,6 +104,7 @@ import {
 import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
 import inboxMixin from 'shared/mixins/inboxMixin';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import { DirectUpload } from 'activestorage';
 
 export default {
   components: {
@@ -443,6 +444,35 @@ export default {
         isPrivate,
       });
     },
+    onDirectFileUpload(file) {
+      if (!file) {
+        return;
+      }
+      if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
+        const upload = new DirectUpload(file.file, '/rails/active_storage/direct_uploads', null, file.file.name);
+        upload.create((error, blob) => {
+          if (error) {
+            this.showAlert(
+              error
+            );
+          } else {
+            this.attachedFiles.push({
+              currentChatId: this.currentChat.id,
+              resource: blob,
+              isPrivate: this.isPrivate,
+              thumb: null,
+              blobSignedId: blob.signed_id,
+            });
+          }
+        });
+      } else {
+        this.showAlert(
+          this.$t('CONVERSATION.FILE_SIZE_LIMIT', {
+            MAXIMUM_FILE_UPLOAD_SIZE,
+          })
+        );
+      }
+    },
     onFileUpload(file) {
       if (!file) {
         return;
@@ -486,7 +516,7 @@ export default {
       if (this.attachedFiles && this.attachedFiles.length) {
         messagePayload.files = [];
         this.attachedFiles.forEach(attachment => {
-          messagePayload.files.push(attachment.resource.file);
+          messagePayload.files.push(attachment.blobSignedId);
         });
       }
 
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index fddcfa3d6..12073c872 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -41,7 +41,7 @@ const sendAttachment = ({ attachment }) => {
   const { file } = attachment;
 
   const formData = new FormData();
-  formData.append('message[attachments][]', file, file.name);
+  formData.append('message[attachments][]', file);
   formData.append('message[referer_url]', referrerURL);
   formData.append('message[timestamp]', timestamp);
   return {
diff --git a/app/javascript/widget/components/ChatAttachment.vue b/app/javascript/widget/components/ChatAttachment.vue
index 501c1bcb2..e1f5b6af3 100755
--- a/app/javascript/widget/components/ChatAttachment.vue
+++ b/app/javascript/widget/components/ChatAttachment.vue
@@ -2,7 +2,8 @@
   <file-upload
     :size="4096 * 2048"
     :accept="allowedFileTypes"
-    @input-file="onFileUpload"
+    :data="{ direct_upload_url: '', direct_upload: true }"
+    @input-file="onDirectFileUpload"
   >
     <button class="icon-button flex items-center justify-center">
       <fluent-icon v-if="!isUploading.image" icon="attach" />
@@ -21,6 +22,8 @@ import {
 } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+import { DirectUpload } from 'activestorage';
+
 export default {
   components: { FluentIcon, FileUpload, Spinner },
   props: {
@@ -44,6 +47,39 @@ export default {
     getFileType(fileType) {
       return fileType.includes('image') ? 'image' : 'file';
     },
+    async onDirectFileUpload(file) {
+      if (!file) {
+        return;
+      }
+      this.isUploading = true;
+      try {
+        if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
+          const upload = new DirectUpload(file.file, '/rails/active_storage/direct_uploads', null, file.file.name);
+
+          upload.create((error, blob) => {
+            if (error) {
+              window.bus.$emit(BUS_EVENTS.SHOW_ALERT, {
+                message: error,
+              });
+            } else {
+              this.onAttach({
+                fileType: blob.content_type,
+                file: blob.signed_id
+              });
+            }
+          });
+        } else {
+          window.bus.$emit(BUS_EVENTS.SHOW_ALERT, {
+            message: this.$t('FILE_SIZE_LIMIT', {
+              MAXIMUM_FILE_UPLOAD_SIZE: this.fileUploadSizeLimit,
+            }),
+          });
+        }
+      } catch (error) {
+        // Error
+      }
+      this.isUploading = false;
+    },
     async onFileUpload(file) {
       if (!file) {
         return;
diff --git a/package.json b/package.json
index 878302c80..70dae965f 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "@rails/webpacker": "5.3.0",
     "@sentry/tracing": "^6.4.1",
     "@sentry/vue": "^6.4.1",
+    "activestorage": "^5.2.6",
     "axios": "^0.21.2",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-vue-jsx": "^3.7.0",

From 17018d392de83d698b43a6bf6f911f09e5aa4b09 Mon Sep 17 00:00:00 2001
From: Frederik Kriewitz <frederik@kriewitz.eu>
Date: Thu, 27 Jan 2022 12:25:27 +0100
Subject: [PATCH 035/101] chore: update deployment scripts to install sudo
 (#3841)

* Update setup_20.04.sh to install sudo
* Update setup_18.04.sh to install sudo
---
 deployment/setup_18.04.sh | 2 +-
 deployment/setup_20.04.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/setup_18.04.sh b/deployment/setup_18.04.sh
index 37d63e2c1..9e9e3cf12 100644
--- a/deployment/setup_18.04.sh
+++ b/deployment/setup_18.04.sh
@@ -17,7 +17,7 @@ apt install -y \
     libssl-dev libyaml-dev libreadline-dev gnupg2 nginx redis-server \
     redis-tools postgresql postgresql-contrib certbot \
     python-certbot-nginx nodejs yarn patch ruby-dev zlib1g-dev liblzma-dev \
-    libgmp-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev
+    libgmp-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev sudo
 
 adduser --disabled-login --gecos "" chatwoot
 
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 6f0e195da..ca8b0a06a 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -39,7 +39,7 @@ apt install -y \
     libssl-dev libyaml-dev libreadline-dev gnupg2 \
     postgresql-client redis-tools \
     nodejs yarn patch ruby-dev zlib1g-dev liblzma-dev \
-    libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev
+    libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev sudo
 
 if [ $install_pg_redis != "no" ]
 then

From e7e46590a4d98ed1a2a875fe47f1db17b3b5497e Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 27 Jan 2022 17:39:21 +0530
Subject: [PATCH 036/101] bug: Fixes sidebar does not show an active page for
 settings page (#3861)

---
 .../sidebarComponents/SecondaryNavItem.vue    | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
index fe8e6d69f..bc4cd3091 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
@@ -73,14 +73,48 @@ export default {
     hasSubMenu() {
       return !!this.menuItem.children;
     },
+    isInboxConversation() {
+      return (
+        this.$store.state.route.name === 'inbox_conversation' &&
+        this.menuItem.toStateName === 'home'
+      );
+    },
+    isTeamsSettings() {
+      return (
+        this.$store.state.route.name === 'settings_teams_edit' &&
+        this.menuItem.toStateName === 'settings_teams_list'
+      );
+    },
+    isInboxsSettings() {
+      return (
+        this.$store.state.route.name === 'settings_inbox_show' &&
+        this.menuItem.toStateName === 'settings_inbox_list'
+      );
+    },
+    isIntegrationsSettings() {
+      return (
+        this.$store.state.route.name === 'settings_integrations_webhook' &&
+        this.menuItem.toStateName === 'settings_integrations'
+      );
+    },
+    isApplicationsSettings() {
+      return (
+        this.$store.state.route.name === 'settings_applications_integration' &&
+        this.menuItem.toStateName === 'settings_applications'
+      );
+    },
+
     computedClass() {
       // If active Inbox is present
       // donot highlight conversations
       if (this.activeInbox) return ' ';
 
       if (
-        this.$store.state.route.name === 'inbox_conversation' &&
-        this.menuItem.toStateName === 'home'
+        this.isInboxConversation ||
+        this.isTeamsSettings ||
+        this.isInboxsSettings ||
+        this.isIntegrationsSettings ||
+        this.isApplicationsSettings
       ) {
         return 'is-active';
       }

From 13eaff156a9b7752467734c4aa1f3edd1b286883 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 27 Jan 2022 17:57:33 +0530
Subject: [PATCH 037/101] Added keybindings for commandbar (#3854)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../dashboard/components/widgets/conversation/ReplyBox.vue | 7 +++++++
 app/javascript/shared/helpers/KeyboardHelpers.js           | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 03019f55e..71e9ed478 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -100,6 +100,7 @@ import {
   isEscape,
   isEnter,
   hasPressedShift,
+  hasPressedCommandPlusKKey,
 } from 'shared/helpers/KeyboardHelpers';
 import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
 import inboxMixin from 'shared/mixins/inboxMixin';
@@ -360,8 +361,14 @@ export default {
           e.preventDefault();
           this.sendMessage();
         }
+      } else if (hasPressedCommandPlusKKey(e)) {
+        this.openCommandBar();
       }
     },
+    openCommandBar() {
+      const ninja = document.querySelector('ninja-keys');
+      ninja.open();
+    },
     toggleEnterToSend(enterToSendEnabled) {
       this.updateUISettings({ enter_to_send_enabled: enterToSendEnabled });
     },
diff --git a/app/javascript/shared/helpers/KeyboardHelpers.js b/app/javascript/shared/helpers/KeyboardHelpers.js
index c9a6c6233..079b5ab62 100644
--- a/app/javascript/shared/helpers/KeyboardHelpers.js
+++ b/app/javascript/shared/helpers/KeyboardHelpers.js
@@ -89,3 +89,7 @@ export const hasPressedArrowUpKey = e => {
 export const hasPressedArrowDownKey = e => {
   return e.keyCode === 40;
 };
+
+export const hasPressedCommandPlusKKey = e => {
+  return e.metaKey && e.keyCode === 75;
+};

From 1467a8fa33ee8d89c46881ae02302c9ef0bfe080 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 28 Jan 2022 05:15:26 +0530
Subject: [PATCH 038/101] Fix: parse verification mail (#3864)

Email parsing logic was stripping of HTML tables which was causing the issue in this case.

Fixes: #3731
---
 app/mailboxes/mailbox_helper.rb  | 10 +++++++++-
 app/presenters/html_parser.rb    |  1 -
 app/presenters/mail_presenter.rb | 16 ++++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 7cdfebe30..06fa8c0ee 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -5,7 +5,7 @@ module MailboxHelper
     @message = @conversation.messages.create(
       account_id: @conversation.account_id,
       sender: @conversation.contact,
-      content: processed_mail.text_content[:reply],
+      content: mail_content,
       inbox_id: @conversation.inbox_id,
       message_type: 'incoming',
       content_type: 'incoming_email',
@@ -48,4 +48,12 @@ module MailboxHelper
     # notification emails are send via mailer sender email address. so it should match
     @processed_mail.original_sender == Mail::Address.new(ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot <accounts@chatwoot.com>')).address
   end
+
+  def mail_content
+    if processed_mail.text_content.present?
+      processed_mail.text_content[:reply]
+    elsif processed_mail.html_content.present?
+      processed_mail.html_content[:reply]
+    end
+  end
 end
diff --git a/app/presenters/html_parser.rb b/app/presenters/html_parser.rb
index 716e1a69a..0f243bb8e 100644
--- a/app/presenters/html_parser.rb
+++ b/app/presenters/html_parser.rb
@@ -15,7 +15,6 @@ class HtmlParser
 
   def filter_replies!
     document.xpath('//blockquote').each { |n| n.replace('&gt; ') }
-    document.xpath('//table').each(&:remove)
   end
 
   def filtered_html
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index 542004595..d406b81be 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -27,15 +27,16 @@ class MailPresenter < SimpleDelegator
   end
 
   # returns encoded mail body text_part if available.
+  # returns encoded mail body as it is if mail_part not available.
   # else returns parsed the html body if contains text/html content.
   def select_body(mail_part)
-    return '' unless mail_part
+    return encoded_mail_body unless mail_part
 
     decoded = encode_to_unicode(mail_part.decoded)
 
     if mail.text_part
       decoded
-    elsif (mail.content_type || '').include? 'text/html'
+    elsif html_mail_body?
       ::HtmlParser.parse_reply(decoded)
     end
   end
@@ -128,4 +129,15 @@ class MailPresenter < SimpleDelegator
   rescue StandardError
     ''
   end
+
+  def html_mail_body?
+    ((mail.content_type || '').include? 'text/html') || @mail.html_part || @mail.html_part.content_type.include?('text/html')
+  end
+
+  # returns mail body if mail content_type is text/plain
+  def encoded_mail_body
+    return encode_to_unicode(@mail.body.decoded) if (@mail.content_type || '').include? 'text/plain'
+
+    ''
+  end
 end

From 357a374478c0fb7ab1a6871c1dae3e3f6ab66fec Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 28 Jan 2022 13:19:22 +0530
Subject: [PATCH 039/101] Fix: Update yarn (#3866)

---
 yarn.lock | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index d500d19fa..67dc2c6a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3081,6 +3081,13 @@ acorn@^8.1.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb"
   integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg==
 
+activestorage@^5.2.6:
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/activestorage/-/activestorage-5.2.6.tgz#63b2efb8fba0e7ebffcd8c3282e35d2ce508fb34"
+  integrity sha512-VXikE6gbraSe7gYJHPHSb1bq74Lg1uPp21PnlYnY26b9jqOE1ULY4qXH/hnLG73F0K1GmjsxjkhqzEIKKl5L0A==
+  dependencies:
+    spark-md5 "^3.0.0"
+
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
@@ -13664,6 +13671,11 @@ space-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
   integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
 
+spark-md5@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
+  integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
+
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"

From a1034a70c45dff43e432a69ba19936e8457939b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Jan 2022 11:41:12 -0800
Subject: [PATCH 040/101] chore(deps): bump node-fetch from 2.6.1 to 2.6.7
 (#3862)

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 67dc2c6a0..5487eaab2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10311,9 +10311,11 @@ node-emoji@^1.8.1:
     lodash.toarray "^4.4.0"
 
 node-fetch@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
 
 node-forge@^0.10.0:
   version "0.10.0"
@@ -14462,6 +14464,11 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
 trim-trailing-lines@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
@@ -15279,6 +15286,11 @@ web-namespaces@^1.0.0:
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
   integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
 webidl-conversions@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
@@ -15462,6 +15474,14 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 whatwg-url@^8.0.0, whatwg-url@^8.5.0:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"

From a95d249ec13e8bdd574a80f17ae6ff0e37e19a41 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 31 Jan 2022 13:36:44 +0530
Subject: [PATCH 041/101] Feat: Custom attribute advanced filter (#3818)

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  6 +-
 app/services/contacts/filter_service.rb       | 20 +++-
 app/services/conversations/filter_service.rb  | 20 ++++
 app/services/filter_service.rb                | 27 +++++
 spec/services/contacts/filter_service_spec.rb | 98 +++++++++++++++++--
 .../conversations/filter_service_spec.rb      | 88 ++++++++++++++---
 7 files changed, 238 insertions(+), 23 deletions(-)

diff --git a/Gemfile b/Gemfile
index f3fbce89d..0664e5aef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -102,7 +102,7 @@ gem 'sentry-ruby'
 gem 'sentry-sidekiq'
 
 ##-- background job processing --##
-gem 'sidekiq'
+gem 'sidekiq', '~> 6.4.0'
 # We want cron jobs
 gem 'sidekiq-cron'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 079dd0ee6..4f1e056bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -447,7 +447,7 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.4.0)
+    redis (4.5.1)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
     regexp_parser (2.1.1)
@@ -546,7 +546,7 @@ GEM
     sexp_processor (4.15.3)
     shoulda-matchers (5.0.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.2.2)
+    sidekiq (6.4.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -726,7 +726,7 @@ DEPENDENCIES
   sentry-ruby
   sentry-sidekiq
   shoulda-matchers
-  sidekiq
+  sidekiq (~> 6.4.0)
   sidekiq-cron
   simplecov (= 0.17.1)
   slack-ruby-client
diff --git a/app/services/contacts/filter_service.rb b/app/services/contacts/filter_service.rb
index 0b0ee57e9..cc90b8502 100644
--- a/app/services/contacts/filter_service.rb
+++ b/app/services/contacts/filter_service.rb
@@ -1,4 +1,6 @@
 class Contacts::FilterService < FilterService
+  ATTRIBUTE_MODEL = 'contact_attribute'.freeze
+
   def perform
     @contacts = contact_query_builder
 
@@ -16,7 +18,7 @@ class Contacts::FilterService < FilterService
       @query_string += contact_query_string(current_filter, query_hash, current_index)
     end
 
-    base_relation.where(@query_string, @filter_values.with_indifferent_access)
+    base_relation.select('distinct contacts.id').where(@query_string, @filter_values.with_indifferent_access)
   end
 
   def contact_query_string(current_filter, query_hash, current_index)
@@ -24,6 +26,8 @@ class Contacts::FilterService < FilterService
     query_operator = query_hash[:query_operator]
     filter_operator_value = filter_operation(query_hash, current_index)
 
+    return custom_attribute_query(query_hash, current_index) if current_filter.nil?
+
     case current_filter['attribute_type']
     when 'additional_attributes'
       "  LOWER(contacts.additional_attributes ->> '#{attribute_key}') #{filter_operator_value} #{query_operator} "
@@ -58,4 +62,18 @@ class Contacts::FilterService < FilterService
 
     "!= :value_#{current_index}"
   end
+
+  def custom_attribute_query(query_hash, current_index)
+    attribute_key = query_hash[:attribute_key]
+    query_operator = query_hash[:query_operator]
+    attribute_type = custom_attribute(attribute_key).try(:attribute_display_type)
+    filter_operator_value = filter_operation(query_hash, current_index)
+    attribute_data_type = self.class::ATTRIBUTE_TYPES[attribute_type]
+
+    if custom_attribute(attribute_key)
+      "  LOWER(contacts.custom_attributes ->> '#{attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
+    else
+      ' '
+    end
+  end
 end
diff --git a/app/services/conversations/filter_service.rb b/app/services/conversations/filter_service.rb
index d0ee60ca7..6e73ae9b8 100644
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -1,4 +1,6 @@
 class Conversations::FilterService < FilterService
+  ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
+
   def perform
     @conversations = conversation_query_builder
     mine_count, unassigned_count, all_count, = set_count_for_all_conversations
@@ -30,6 +32,8 @@ class Conversations::FilterService < FilterService
     query_operator = query_hash[:query_operator]
     filter_operator_value = filter_operation(query_hash, current_index)
 
+    return custom_attribute_query(query_hash, current_index) if current_filter.nil?
+
     case current_filter['attribute_type']
     when 'additional_attributes'
       " conversations.additional_attributes ->> '#{attribute_key}' #{filter_operator_value} #{query_operator} "
@@ -56,4 +60,20 @@ class Conversations::FilterService < FilterService
     )
     @conversations.latest.page(current_page)
   end
+
+  private
+
+  def custom_attribute_query(query_hash, current_index)
+    attribute_key = query_hash[:attribute_key]
+    query_operator = query_hash[:query_operator]
+    attribute_type = custom_attribute(attribute_key).try(:attribute_display_type)
+    filter_operator_value = filter_operation(query_hash, current_index)
+    attribute_data_type = self.class::ATTRIBUTE_TYPES[attribute_type]
+
+    if custom_attribute(attribute_key)
+      " LOWER(conversations.custom_attributes ->> '#{attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
+    else
+      ' '
+    end
+  end
 end
diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb
index 054060742..a08fb947a 100644
--- a/app/services/filter_service.rb
+++ b/app/services/filter_service.rb
@@ -1,6 +1,16 @@
 require 'json'
 
 class FilterService
+  ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
+  ATTRIBUTE_TYPES = {
+    date: 'date',
+    text: 'text',
+    number: 'numeric',
+    link: 'text',
+    list: 'text',
+    checkbox: 'boolean'
+  }.with_indifferent_access
+
   def initialize(params, user)
     @params = params
     @user = user
@@ -24,6 +34,8 @@ class FilterService
       @filter_values["value_#{current_index}"] = 'IS NOT NULL'
     when 'is_not_present'
       @filter_values["value_#{current_index}"] = 'IS NULL'
+    when 'is_greater_than', 'is_less_than'
+      @filter_values["value_#{current_index}"] = lt_gt_filter_values(query_hash)
     else
       @filter_values["value_#{current_index}"] = filter_values(query_hash).to_s
       "= :value_#{current_index}"
@@ -43,6 +55,15 @@ class FilterService
     end
   end
 
+  def lt_gt_filter_values(query_hash)
+    attribute_key = query_hash[:attribute_key]
+    attribute_type = custom_attribute(attribute_key).try(:attribute_display_type)
+    attribute_data_type = self.class::ATTRIBUTE_TYPES[attribute_type]
+    value = query_hash['values'][0]
+    operator = query_hash['filter_operator'] == 'is_less_than' ? '<' : '>'
+    "#{operator} '#{value}'::#{attribute_data_type}"
+  end
+
   def set_count_for_all_conversations
     [
       @conversations.assigned_to(@user).count,
@@ -53,6 +74,12 @@ class FilterService
 
   private
 
+  def custom_attribute(attribute_key)
+    @custom_attribute = Current.account.custom_attribute_definitions.where(
+      attribute_model: self.class::ATTRIBUTE_MODEL
+    ).find_by(attribute_key: attribute_key)
+  end
+
   def equals_to_filter_string(filter_operator, current_index)
     return  "IN (:value_#{current_index})" if filter_operator == 'equal_to'
 
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index 8275d0d52..14f4c1d27 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -7,17 +7,46 @@ describe ::Contacts::FilterService do
   let!(:user_1) { create(:user, account: account) }
   let!(:user_2) { create(:user, account: account) }
   let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
-  let!(:contact) { create(:contact, account: account, additional_attributes: { 'browser_language': 'en' }) }
+  let(:en_contact) { create(:contact, account: account, additional_attributes: { 'browser_language': 'en' }) }
+  let(:el_contact) { create(:contact, account: account, additional_attributes: { 'browser_language': 'el' }) }
+  let(:cs_contact) { create(:contact, account: account, additional_attributes: { 'browser_language': 'cs' }) }
 
   before do
     create(:inbox_member, user: user_1, inbox: inbox)
     create(:inbox_member, user: user_2, inbox: inbox)
-    create(:conversation, account: account, inbox: inbox, assignee: user_1, contact: contact)
+    create(:conversation, account: account, inbox: inbox, assignee: user_1, contact: en_contact)
     create(:conversation, account: account, inbox: inbox)
     Current.account = account
+
+    create(:custom_attribute_definition,
+           attribute_key: 'contact_additional_information',
+           account: account,
+           attribute_model: 'contact_attribute',
+           attribute_display_type: 'text')
+    create(:custom_attribute_definition,
+           attribute_key: 'customer_type',
+           account: account,
+           attribute_model: 'contact_attribute',
+           attribute_display_type: 'list',
+           attribute_values: %w[regular platinum gold])
+    create(:custom_attribute_definition,
+           attribute_key: 'signed_in_at',
+           account: account,
+           attribute_model: 'contact_attribute',
+           attribute_display_type: 'date')
   end
 
   describe '#perform' do
+    before do
+      en_contact.add_labels(%w[random_label support])
+      el_contact.update_labels('random_label')
+      cs_contact.update_labels('support')
+
+      en_contact.update!(custom_attributes: { contact_additional_information: 'test custom data' })
+      el_contact.update!(custom_attributes: { contact_additional_information: 'test custom data', customer_type: 'platinum' })
+      cs_contact.update!(custom_attributes: { customer_type: 'platinum', signed_in_at: '2022-01-19' })
+    end
+
     context 'with query present' do
       let!(:params) { { payload: [], page: 1 } }
       let(:payload) do
@@ -31,7 +60,7 @@ describe ::Contacts::FilterService do
           {
             attribute_key: 'name',
             filter_operator: 'equal_to',
-            values: [contact.name],
+            values: [en_contact.name],
             query_operator: nil
           }.with_indifferent_access
         ]
@@ -40,22 +69,77 @@ describe ::Contacts::FilterService do
       it 'filter contacts by additional_attributes' do
         params[:payload] = payload
         result = filter_service.new(params, user_1).perform
-        expect(result.length).to be 2
+        expect(result[:contacts].length).to be 1
       end
 
       it 'filter contact by tags' do
-        Contact.last.update_labels('support')
+        label_id = cs_contact.labels.last.id
         params[:payload] = [
           {
             attribute_key: 'labels',
             filter_operator: 'equal_to',
-            values: [1],
+            values: [label_id],
             query_operator: nil
           }.with_indifferent_access
         ]
 
         result = filter_service.new(params, user_1).perform
-        expect(result.length).to be 2
+        expect(result[:contacts].length).to be 2
+        expect(result[:contacts].first.label_list).to include('support')
+        expect(result[:contacts].last.label_list).to include('support')
+      end
+
+      it 'filter by custom_attributes and labels' do
+        label_id = cs_contact.labels.last.id
+        params[:payload] = [
+          {
+            attribute_key: 'customer_type',
+            filter_operator: 'equal_to',
+            values: ['platinum'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'labels',
+            filter_operator: 'equal_to',
+            values: [label_id],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'signed_in_at',
+            filter_operator: 'is_less_than',
+            values: ['2022-01-20'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:contacts].length).to be 1
+        expect(result[:contacts].first.id).to eq(cs_contact.id)
+      end
+
+      it 'filter by custom_attributes and additional_attributes' do
+        params[:payload] = [
+          {
+            attribute_key: 'customer_type',
+            filter_operator: 'equal_to',
+            values: ['platinum'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'browser_language',
+            filter_operator: 'equal_to',
+            values: ['el'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'contact_additional_information',
+            filter_operator: 'equal_to',
+            values: ['test custom data'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:contacts].length).to be 1
+        expect(result[:contacts].first.id).to eq(el_contact.id)
       end
     end
   end
diff --git a/spec/services/conversations/filter_service_spec.rb b/spec/services/conversations/filter_service_spec.rb
index e226e96d5..c199cd3e2 100644
--- a/spec/services/conversations/filter_service_spec.rb
+++ b/spec/services/conversations/filter_service_spec.rb
@@ -10,18 +10,43 @@ describe ::Conversations::FilterService do
   let!(:campaign_2) { create(:campaign, title: 'Campaign', account: account) }
   let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
 
+  let!(:unassigned_conversation) { create(:conversation, account: account, inbox: inbox) }
+  let!(:user_2_assigned_conversation) { create(:conversation, account: account, inbox: inbox, assignee: user_2) }
+  let!(:en_conversation_1) do
+    create(:conversation, account: account, inbox: inbox, assignee: user_1, campaign_id: campaign_1.id,
+                          status: 'pending', additional_attributes: { 'browser_language': 'en' })
+  end
+  let!(:en_conversation_2) do
+    create(:conversation, account: account, inbox: inbox, assignee: user_1, campaign_id: campaign_2.id,
+                          status: 'pending', additional_attributes: { 'browser_language': 'en' })
+  end
+
   before do
     create(:inbox_member, user: user_1, inbox: inbox)
     create(:inbox_member, user: user_2, inbox: inbox)
-    create(:conversation, account: account, inbox: inbox, assignee: user_1)
-    create(:conversation, account: account, inbox: inbox, assignee: user_1, campaign_id: campaign_1.id,
-                          status: 'pending', additional_attributes: { 'browser_language': 'en' })
-    create(:conversation, account: account, inbox: inbox, assignee: user_1, campaign_id: campaign_2.id,
-                          status: 'pending', additional_attributes: { 'browser_language': 'en' })
-    create(:conversation, account: account, inbox: inbox, assignee: user_2)
-    # unassigned conversation
-    create(:conversation, account: account, inbox: inbox)
     Current.account = account
+
+    en_conversation_1.update!(custom_attributes: { conversation_additional_information: 'test custom data' })
+    en_conversation_2.update!(custom_attributes: { conversation_additional_information: 'test custom data', conversation_type: 'platinum' })
+    user_2_assigned_conversation.update!(custom_attributes: { conversation_type: 'platinum', conversation_created: '2022-01-19' })
+    create(:conversation, account: account, inbox: inbox, assignee: user_1)
+
+    create(:custom_attribute_definition,
+           attribute_key: 'conversation_type',
+           account: account,
+           attribute_model: 'conversation_attribute',
+           attribute_display_type: 'list',
+           attribute_values: %w[regular platinum gold])
+    create(:custom_attribute_definition,
+           attribute_key: 'conversation_created',
+           account: account,
+           attribute_model: 'conversation_attribute',
+           attribute_display_type: 'date')
+    create(:custom_attribute_definition,
+           attribute_key: 'conversation_additional_information',
+           account: account,
+           attribute_model: 'conversation_attribute',
+           attribute_display_type: 'text')
   end
 
   describe '#perform' do
@@ -44,14 +69,14 @@ describe ::Conversations::FilterService do
         ]
       end
 
-      it 'filter conversations by custom_attributes and status' do
+      it 'filter conversations by additional_attributes and status' do
         params[:payload] = payload
         result = filter_service.new(params, user_1).perform
         conversations = Conversation.where("additional_attributes ->> 'browser_language' IN (?) AND status IN (?)", ['en'], [1, 2])
         expect(result.length).to be conversations.count
       end
 
-      it 'filter conversations by custom_attributes and status with pagination' do
+      it 'filter conversations by additional_attributes and status with pagination' do
         params[:payload] = payload
         params[:page] = 2
         result = filter_service.new(params, user_1).perform
@@ -60,7 +85,7 @@ describe ::Conversations::FilterService do
       end
 
       it 'filter conversations by tags' do
-        Conversation.last.update_labels('support')
+        unassigned_conversation.update_labels('support')
         params[:payload] = [
           {
             attribute_key: 'assignee_id',
@@ -107,4 +132,45 @@ describe ::Conversations::FilterService do
       end
     end
   end
+
+  describe '#perform on custom attribute' do
+    context 'with query present' do
+      let!(:params) { { payload: [], page: 1 } }
+      let(:payload) do
+        [
+          {
+            attribute_key: 'browser_language',
+            filter_operator: 'contains',
+            values: 'en',
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'status',
+            filter_operator: 'not_equal_to',
+            values: %w[resolved],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+      end
+
+      it 'filter by custom_attributes and labels' do
+        params[:payload] = [
+          {
+            attribute_key: 'conversation_type',
+            filter_operator: 'equal_to',
+            values: ['platinum'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'conversation_created',
+            filter_operator: 'is_less_than',
+            values: ['2022-01-20'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:conversations].length).to be 1
+      end
+    end
+  end
 end

From b1e1d7e423efef13d109e4c83d4274d87ed2a009 Mon Sep 17 00:00:00 2001
From: Prithvi Tharun <ptrithu8@gmail.com>
Date: Tue, 1 Feb 2022 11:12:20 +0530
Subject: [PATCH 042/101] fix: Update the copy to use inclusive language
 (#3880)

Fixes #3879
---
 app/javascript/dashboard/i18n/locale/en/inboxMgmt.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 1b74e558e..537998ac9 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
@@ -443,7 +443,7 @@
         "LABEL": "Password",
         "PLACE_HOLDER": "Password"
       },
-      "ENABLE_SSL": "Enable SSL" 
+      "ENABLE_SSL": "Enable SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",

From e0d24e0a73c67d61fc6b312bdb0173ed1910e3cd Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 31 Jan 2022 22:55:51 -0800
Subject: [PATCH 043/101] chore: Use globalConfig in NetworkNotification
 (#3871)

---
 .../dashboard/components/NetworkNotification.vue | 16 +++++++++++++++-
 .../widgets/WootWriter/ReplyBottomPanel.vue      | 13 ++++++++-----
 .../components/widgets/conversation/ReplyBox.vue | 11 +++++++----
 .../widget/components/ChatAttachment.vue         |  9 +++++++--
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/javascript/dashboard/components/NetworkNotification.vue b/app/javascript/dashboard/components/NetworkNotification.vue
index 767bb7a84..deb5931c4 100644
--- a/app/javascript/dashboard/components/NetworkNotification.vue
+++ b/app/javascript/dashboard/components/NetworkNotification.vue
@@ -4,7 +4,12 @@
       <div class="ui-notification">
         <fluent-icon icon="wifi-off" />
         <p class="ui-notification-text">
-          {{ $t('NETWORK.NOTIFICATION.TEXT') }}
+          {{
+            useInstallationName(
+              $t('NETWORK.NOTIFICATION.TEXT'),
+              globalConfig.installationName
+            )
+          }}
         </p>
         <woot-button variant="clear" size="small" @click="refreshPage">
           {{ $t('NETWORK.BUTTON.REFRESH') }}
@@ -23,13 +28,22 @@
 </template>
 
 <script>
+import globalConfigMixin from 'shared/mixins/globalConfigMixin';
+import { mapGetters } from 'vuex';
+
 export default {
+  mixins: [globalConfigMixin],
+
   data() {
     return {
       showNotification: !navigator.onLine,
     };
   },
 
+  computed: {
+    ...mapGetters({ globalConfig: 'globalConfig/get' }),
+  },
+
   mounted() {
     window.addEventListener('offline', this.updateOnlineStatus);
   },
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index f53cfcfc5..1d71f82a0 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -19,7 +19,10 @@
         :multiple="enableMultipleFileUpload"
         :drop="true"
         :drop-directory="false"
-        :data="{ direct_upload_url: '/rails/active_storage/direct_uploads', direct_upload: true }"
+        :data="{
+          direct_upload_url: '/rails/active_storage/direct_uploads',
+          direct_upload: true,
+        }"
         @input-file="onDirectFileUpload"
       >
         <woot-button
@@ -81,7 +84,7 @@
 
 <script>
 import FileUpload from 'vue-upload-component';
-import * as ActiveStorage from "activestorage";
+import * as ActiveStorage from 'activestorage';
 import {
   hasPressedAltAndWKey,
   hasPressedAltAndAKey,
@@ -152,9 +155,6 @@ export default {
       default: true,
     },
   },
-  mounted() {
-    ActiveStorage.start();
-  },
   computed: {
     isNote() {
       return this.mode === REPLY_EDITOR_MODES.NOTE;
@@ -176,6 +176,9 @@ export default {
       return ALLOWED_FILE_TYPES;
     },
   },
+  mounted() {
+    ActiveStorage.start();
+  },
   methods: {
     handleKeyEvents(e) {
       if (hasPressedAltAndWKey(e)) {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 71e9ed478..b1fba6ce4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -456,12 +456,15 @@ export default {
         return;
       }
       if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
-        const upload = new DirectUpload(file.file, '/rails/active_storage/direct_uploads', null, file.file.name);
+        const upload = new DirectUpload(
+          file.file,
+          '/rails/active_storage/direct_uploads',
+          null,
+          file.file.name
+        );
         upload.create((error, blob) => {
           if (error) {
-            this.showAlert(
-              error
-            );
+            this.showAlert(error);
           } else {
             this.attachedFiles.push({
               currentChatId: this.currentChat.id,
diff --git a/app/javascript/widget/components/ChatAttachment.vue b/app/javascript/widget/components/ChatAttachment.vue
index e1f5b6af3..1625a41a2 100755
--- a/app/javascript/widget/components/ChatAttachment.vue
+++ b/app/javascript/widget/components/ChatAttachment.vue
@@ -54,7 +54,12 @@ export default {
       this.isUploading = true;
       try {
         if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
-          const upload = new DirectUpload(file.file, '/rails/active_storage/direct_uploads', null, file.file.name);
+          const upload = new DirectUpload(
+            file.file,
+            '/rails/active_storage/direct_uploads',
+            null,
+            file.file.name
+          );
 
           upload.create((error, blob) => {
             if (error) {
@@ -64,7 +69,7 @@ export default {
             } else {
               this.onAttach({
                 fileType: blob.content_type,
-                file: blob.signed_id
+                file: blob.signed_id,
               });
             }
           });

From 52d1821cd3dfaf9e56e422f3821dacf704dba467 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Tue, 1 Feb 2022 13:13:55 +0530
Subject: [PATCH 044/101] feature: Filtering conversations and contacts with
 custom attributes (#3851)

---
 .codeclimate.yml                              |   4 +
 .../dashboard/components/ChatList.vue         |   2 +-
 .../components/ui/DateTimePicker.vue          |   2 +-
 .../FilterInput/FilterOperatorTypes.js        |  75 ++++++
 .../Index.vue}                                |  37 +++
 .../ConversationAdvancedFilter.vue            |  61 +++--
 .../conversation/advancedFilterItems/index.js | 229 ++++++------------
 .../i18n/locale/en/advancedFilters.json       |  16 +-
 .../i18n/locale/en/contactFilters.json        |  16 +-
 .../components/ContactsAdvancedFilters.vue    |  61 +++--
 .../contacts/components/ContactsView.vue      |   2 +-
 .../contacts/contactFilterItems/index.js      | 135 ++++-------
 app/javascript/shared/mixins/filterMixin.js   |  44 ++++
 .../shared/mixins/specs/MockComponent.vue     |   9 +
 .../shared/mixins/specs/filterFixtures.js     |  29 +++
 .../shared/mixins/specs/filterMixin.spec.js   |  13 +
 16 files changed, 451 insertions(+), 284 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js
 rename app/javascript/dashboard/components/widgets/{FilterInput.vue => FilterInput/Index.vue} (85%)
 create mode 100644 app/javascript/shared/mixins/filterMixin.js
 create mode 100644 app/javascript/shared/mixins/specs/MockComponent.vue
 create mode 100644 app/javascript/shared/mixins/specs/filterFixtures.js
 create mode 100644 app/javascript/shared/mixins/specs/filterMixin.spec.js

diff --git a/.codeclimate.yml b/.codeclimate.yml
index f26021240..6b9e1a78f 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -22,6 +22,9 @@ checks:
     enabled: true
     config:
       threshold: 300
+  method-lines:
+    config:
+      threshold: 50
 exclude_patterns:
   - 'spec/'
   - '**/specs/'
@@ -44,3 +47,4 @@ exclude_patterns:
   - 'app/javascript/shared/constants/countries.js'
   - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js'
   - 'app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js'
+  - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 4b951a705..a1651c534 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -129,7 +129,7 @@
     >
       <conversation-advanced-filter
         v-if="showAdvancedFilters"
-        :filter-types="advancedFilterTypes"
+        :initial-filter-types="advancedFilterTypes"
         :on-close="onToggleAdvanceFiltersModal"
         @applyFilter="onApplyFilter"
       />
diff --git a/app/javascript/dashboard/components/ui/DateTimePicker.vue b/app/javascript/dashboard/components/ui/DateTimePicker.vue
index 4507edf78..979136695 100644
--- a/app/javascript/dashboard/components/ui/DateTimePicker.vue
+++ b/app/javascript/dashboard/components/ui/DateTimePicker.vue
@@ -30,7 +30,7 @@ export default {
     },
     value: {
       type: Date,
-      default: () => [],
+      default: [],
     },
   },
 
diff --git a/app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js b/app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js
new file mode 100644
index 000000000..9e9e3a844
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js
@@ -0,0 +1,75 @@
+export const OPERATOR_TYPES_1 = [
+  {
+    value: 'equal_to',
+    label: 'Equal to',
+  },
+  {
+    value: 'not_equal_to',
+    label: 'Not equal to',
+  },
+];
+
+export const OPERATOR_TYPES_2 = [
+  {
+    value: 'equal_to',
+    label: 'Equal to',
+  },
+  {
+    value: 'not_equal_to',
+    label: 'Not equal to',
+  },
+  {
+    value: 'is_present',
+    label: 'Is present',
+  },
+  {
+    value: 'is_not_present',
+    label: 'Is not present',
+  },
+];
+
+export const OPERATOR_TYPES_3 = [
+  {
+    value: 'equal_to',
+    label: 'Equal to',
+  },
+  {
+    value: 'not_equal_to',
+    label: 'Not equal to',
+  },
+  {
+    value: 'contains',
+    label: 'Contains',
+  },
+  {
+    value: 'does_not_contain',
+    label: 'Does not contain',
+  },
+];
+
+export const OPERATOR_TYPES_4 = [
+  {
+    value: 'equal_to',
+    label: 'Equal to',
+  },
+  {
+    value: 'not_equal_to',
+    label: 'Not equal to',
+  },
+  {
+    value: 'is_present',
+    label: 'Is present',
+  },
+  {
+    value: 'is_not_present',
+    label: 'Is not present',
+  },
+  {
+    value: 'is_greater_than',
+    label: 'Is greater than',
+  },
+  {
+    value: 'is_lesser_than',
+    label: 'Is lesser than',
+  },
+];
diff --git a/app/javascript/dashboard/components/widgets/FilterInput.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
similarity index 85%
rename from app/javascript/dashboard/components/widgets/FilterInput.vue
rename to app/javascript/dashboard/components/widgets/FilterInput/Index.vue
index e0d0ea3b6..a64425393 100644
--- a/app/javascript/dashboard/components/widgets/FilterInput.vue
+++ b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
@@ -3,6 +3,27 @@
     <div class="filter">
       <div class="filter-inputs">
         <select
+          v-if="groupedFilters"
+          v-model="attributeKey"
+          class="filter__question"
+          @change="resetFilter()"
+        >
+          <optgroup
+            v-for="(group, i) in filterGroups"
+            :key="i"
+            :label="group.name"
+          >
+            <option
+              v-for="attribute in group.attributes"
+              :key="attribute.key"
+              :value="attribute.key"
+            >
+              {{ attribute.name }}
+            </option>
+          </optgroup>
+        </select>
+        <select
+          v-else
           v-model="attributeKey"
           class="filter__question"
           @change="resetFilter()"
@@ -63,6 +84,14 @@
               :option-height="104"
             />
           </div>
+          <div v-else-if="inputType === 'date'" class="multiselect-wrap--small">
+            <input
+              v-model="values"
+              type="date"
+              :editable="false"
+              class="answer--text-input datepicker"
+            />
+          </div>
           <input
             v-else
             v-model="values"
@@ -132,6 +161,14 @@ export default {
       type: Boolean,
       default: true,
     },
+    groupedFilters: {
+      type: Boolean,
+      default: true,
+    },
+    filterGroups: {
+      type: Array,
+      default: () => [],
+    },
   },
   computed: {
     attributeKey: {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
index acf7f3cfd..de65bb042 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
@@ -9,12 +9,13 @@
           v-for="(filter, i) in appliedFilters"
           :key="i"
           v-model="appliedFilters[i]"
-          :filter-attributes="filterAttributes"
+          :filter-groups="filterGroups"
           :input-type="getInputType(appliedFilters[i].attribute_key)"
           :operators="getOperators(appliedFilters[i].attribute_key)"
           :dropdown-values="getDropdownValues(appliedFilters[i].attribute_key)"
           :show-query-operator="i !== appliedFilters.length - 1"
           :show-user-input="showUserInput(appliedFilters[i].filter_operator)"
+          :grouped-filters="true"
           :v="$v.appliedFilters.$each[i]"
           @resetFilter="resetFilter(i, appliedFilters[i])"
           @removeFilter="removeFilter(i)"
@@ -48,22 +49,24 @@
 <script>
 import alertMixin from 'shared/mixins/alertMixin';
 import { required, requiredIf } from 'vuelidate/lib/validators';
-import FilterInputBox from '../FilterInput.vue';
+import FilterInputBox from '../FilterInput/Index.vue';
 import languages from './advancedFilterItems/languages';
-import countries from '/app/javascript/shared/constants/countries.js';
+import countries from 'shared/constants/countries.js';
 import { mapGetters } from 'vuex';
-
+import { filterAttributeGroups } from './advancedFilterItems';
+import filterMixin from 'shared/mixins/filterMixin';
+import * as OPERATORS from 'dashboard/components/widgets/FilterInput/FilterOperatorTypes.js';
 export default {
   components: {
     FilterInputBox,
   },
-  mixins: [alertMixin],
+  mixins: [alertMixin, filterMixin],
   props: {
     onClose: {
       type: Function,
       default: () => {},
     },
-    filterTypes: {
+    initialFilterTypes: {
       type: Array,
       default: () => [],
     },
@@ -87,22 +90,21 @@ export default {
     return {
       show: true,
       appliedFilters: [],
+      filterTypes: this.initialFilterTypes,
+      filterAttributeGroups,
+      filterGroups: [],
+      allCustomAttributes: [],
+      attributeModel: 'conversation_attribute',
+      filtersFori18n: 'FILTER',
     };
   },
   computed: {
-    filterAttributes() {
-      return this.filterTypes.map(type => {
-        return {
-          key: type.attributeKey,
-          name: this.$t(`FILTER.ATTRIBUTES.${type.attributeI18nKey}`),
-        };
-      });
-    },
     ...mapGetters({
       getAppliedConversationFilters: 'getAppliedConversationFilters',
     }),
   },
   mounted() {
+    this.setFilterAttributes();
     this.$store.dispatch('campaigns/get');
     if (this.getAppliedConversationFilters.length) {
       this.appliedFilters = [...this.getAppliedConversationFilters];
@@ -112,10 +114,41 @@ export default {
         filter_operator: 'equal_to',
         values: '',
         query_operator: 'and',
+        attribute_model: 'standard',
       });
     }
   },
   methods: {
+    getOperatorTypes(key) {
+      switch (key) {
+        case 'list':
+          return OPERATORS.OPERATOR_TYPES_1;
+        case 'text':
+          return OPERATORS.OPERATOR_TYPES_3;
+        case 'number':
+          return OPERATORS.OPERATOR_TYPES_1;
+        case 'link':
+          return OPERATORS.OPERATOR_TYPES_1;
+        case 'date':
+          return OPERATORS.OPERATOR_TYPES_4;
+        case 'checkbox':
+          return OPERATORS.OPERATOR_TYPES_1;
+        default:
+          return OPERATORS.OPERATOR_TYPES_1;
+      }
+    },
+    customAttributeInputType(key) {
+      switch (key) {
+        case 'date':
+          return 'date';
+        default:
+          return 'plain_text';
+      }
+    },
+    getAttributeModel(key) {
+      const type = this.filterTypes.find(filter => filter.attributeKey === key);
+      return type.attributeModel;
+    },
     getInputType(key) {
       const type = this.filterTypes.find(filter => filter.attributeKey === key);
       return type.inputType;
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js
index 3cf8dc6ce..98e27c5bb 100644
--- a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js
@@ -1,229 +1,144 @@
+import {
+  OPERATOR_TYPES_1,
+  OPERATOR_TYPES_2,
+  OPERATOR_TYPES_3,
+} from '../../FilterInput/FilterOperatorTypes';
+
 const filterTypes = [
   {
     attributeKey: 'status',
     attributeI18nKey: 'STATUS',
     inputType: 'multi_select',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-    ],
-    attribute_type: 'standard',
+    filterOperators: OPERATOR_TYPES_1,
+    attributeModel: 'standard',
   },
   {
     attributeKey: 'assignee_id',
     attributeI18nKey: 'ASSIGNEE_NAME',
     inputType: 'search_select',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'is_present',
-        label: 'Is present',
-      },
-      {
-        value: 'is_not_present',
-        label: 'Is not present',
-      },
-    ],
-    attribute_type: 'standard',
+    filterOperators: OPERATOR_TYPES_2,
+    attributeModel: 'standard',
   },
   {
     attributeKey: 'inbox_id',
     attributeI18nKey: 'INBOX_NAME',
     inputType: 'search_select',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'is_present',
-        label: 'Is present',
-      },
-      {
-        value: 'is_not_present',
-        label: 'Is not present',
-      },
-    ],
-    attribute_type: 'standard',
+    filterOperators: OPERATOR_TYPES_2,
+    attributeModel: 'standard',
   },
   {
     attributeKey: 'team_id',
     attributeI18nKey: 'TEAM_NAME',
     inputType: 'search_select',
     dataType: 'number',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'is_present',
-        label: 'Is present',
-      },
-      {
-        value: 'is_not_present',
-        label: 'Is not present',
-      },
-    ],
-    attribute_type: 'standard',
+    filterOperators: OPERATOR_TYPES_2,
+    attributeModel: 'standard',
   },
   {
     attributeKey: 'display_id',
     attributeI18nKey: 'CONVERSATION_IDENTIFIER',
     inputType: 'plain_text',
     dataType: 'Number',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'contains',
-        label: 'Contains',
-      },
-      {
-        value: 'does_not_contain',
-        label: 'Does not contain',
-      },
-    ],
-    attribute_type: 'standard',
+    filterOperators: OPERATOR_TYPES_3,
+    attributeModel: 'standard',
   },
   {
     attributeKey: 'campaign_id',
     attributeI18nKey: 'CAMPAIGN_NAME',
     inputType: 'search_select',
     dataType: 'Number',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'is_present',
-        label: 'Is present',
-      },
-      {
-        value: 'is_not_present',
-        label: 'Is not present',
-      },
-    ],
-    attribute_type: 'standard',
+    filterOperators: OPERATOR_TYPES_2,
+    attributeModel: 'standard',
   },
   {
     attributeKey: 'labels',
     attributeI18nKey: 'LABELS',
     inputType: 'multi_select',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'is_present',
-        label: 'Is present',
-      },
-      {
-        value: 'is_not_present',
-        label: 'Is not present',
-      },
-    ],
-    attribute_type: 'standard',
+    filterOperators: OPERATOR_TYPES_2,
+    attributeModel: 'standard',
   },
   {
     attributeKey: 'browser_language',
     attributeI18nKey: 'BROWSER_LANGUAGE',
     inputType: 'search_select',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-    ],
-    attribute_type: 'additional_attributes',
+    filterOperators: OPERATOR_TYPES_1,
+    attributeModel: 'additional',
   },
   {
     attributeKey: 'country_code',
     attributeI18nKey: 'COUNTRY_NAME',
     inputType: 'search_select',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-    ],
-    attribute_type: 'additional_attributes',
+    filterOperators: OPERATOR_TYPES_1,
+    attributeModel: 'additional',
   },
   {
     attributeKey: 'referer',
     attributeI18nKey: 'REFERER_LINK',
     inputType: 'plain_text',
     dataType: 'text',
-    filterOperators: [
+    filterOperators: OPERATOR_TYPES_3,
+    attributeModel: 'additional',
+  },
+];
+
+export const filterAttributeGroups = [
+  {
+    name: 'Standard Filters',
+    i18nGroup: 'STANDARD_FILTERS',
+    attributes: [
       {
-        value: 'equal_to',
-        label: 'Equal to',
+        key: 'status',
+        i18nKey: 'STATUS',
       },
       {
-        value: 'not_equal_to',
-        label: 'Not equal to',
+        key: 'assignee_id',
+        i18nKey: 'ASSIGNEE_NAME',
       },
       {
-        value: 'contains',
-        label: 'Contains',
+        key: 'inbox_id',
+        i18nKey: 'INBOX_NAME',
       },
       {
-        value: 'does_not_contain',
-        label: 'Does not contain',
+        key: 'team_id',
+        i18nKey: 'TEAM_NAME',
+      },
+      {
+        key: 'display_id',
+        i18nKey: 'CONVERSATION_IDENTIFIER',
+      },
+      {
+        key: 'campaign_id',
+        i18nKey: 'CAMPAIGN_NAME',
+      },
+      {
+        key: 'labels',
+        i18nKey: 'LABELS',
+      },
+    ],
+  },
+  {
+    name: 'Additional Filters',
+    i18nGroup: 'ADDITIONAL_FILTERS',
+    attributes: [
+      {
+        key: 'browser_language',
+        i18nKey: 'BROWSER_LANGUAGE',
+      },
+      {
+        key: 'country_code',
+        i18nKey: 'COUNTRY_NAME',
+      },
+      {
+        key: 'referer',
+        i18nKey: 'REFERER_LINK',
       },
     ],
-    attribute_type: 'additional_attributes',
   },
 ];
 
diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index 5ab31027a..f00973f29 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,17 @@
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Custom Attributes"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
diff --git a/app/javascript/dashboard/i18n/locale/en/contactFilters.json b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
index 8ebe460bb..a752d537c 100644
--- a/app/javascript/dashboard/i18n/locale/en/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Name",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Phone number",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
         }
     }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
index a91f4e6d4..04ba42f33 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
@@ -9,7 +9,8 @@
           v-for="(filter, i) in appliedFilters"
           :key="i"
           v-model="appliedFilters[i]"
-          :filter-attributes="filterAttributes"
+          :filter-groups="filterGroups"
+          :grouped-filters="true"
           :input-type="getInputType(appliedFilters[i].attribute_key)"
           :operators="getOperators(appliedFilters[i].attribute_key)"
           :dropdown-values="getDropdownValues(appliedFilters[i].attribute_key)"
@@ -58,21 +59,23 @@
 <script>
 import alertMixin from 'shared/mixins/alertMixin';
 import { required } from 'vuelidate/lib/validators';
-import FilterInputBox from '../../../../components/widgets/FilterInput.vue';
-import countries from '/app/javascript/shared/constants/countries.js';
+import FilterInputBox from '../../../../components/widgets/FilterInput/Index.vue';
+import countries from 'shared/constants/countries.js';
 import { mapGetters } from 'vuex';
-
+import { filterAttributeGroups } from '../contactFilterItems';
+import filterMixin from 'shared/mixins/filterMixin';
+import * as OPERATORS from 'dashboard/components/widgets/FilterInput/FilterOperatorTypes.js';
 export default {
   components: {
     FilterInputBox,
   },
-  mixins: [alertMixin],
+  mixins: [alertMixin, filterMixin],
   props: {
     onClose: {
       type: Function,
       default: () => {},
     },
-    filterTypes: {
+    initialFilterTypes: {
       type: Array,
       default: () => [],
     },
@@ -91,17 +94,15 @@ export default {
     return {
       show: true,
       appliedFilters: [],
+      filterTypes: this.initialFilterTypes,
+      filterGroups: [],
+      allCustomAttributes: [],
+      filterAttributeGroups,
+      attributeModel: 'contact_attribute',
+      filtersFori18n: 'CONTACTS_FILTER',
     };
   },
   computed: {
-    filterAttributes() {
-      return this.filterTypes.map(type => {
-        return {
-          key: type.attributeKey,
-          name: this.$t(`CONTACTS_FILTER.ATTRIBUTES.${type.attributeI18nKey}`),
-        };
-      });
-    },
     ...mapGetters({
       getAppliedContactFilters: 'contacts/getAppliedContactFilters',
     }),
@@ -110,6 +111,7 @@ export default {
     },
   },
   mounted() {
+    this.setFilterAttributes();
     if (this.getAppliedContactFilters.length) {
       this.appliedFilters = [...this.getAppliedContactFilters];
     } else {
@@ -118,10 +120,41 @@ export default {
         filter_operator: 'equal_to',
         values: '',
         query_operator: 'and',
+        attribute_model: 'standard',
       });
     }
   },
   methods: {
+    getOperatorTypes(key) {
+      switch (key) {
+        case 'list':
+          return OPERATORS.OPERATOR_TYPES_1;
+        case 'text':
+          return OPERATORS.OPERATOR_TYPES_3;
+        case 'number':
+          return OPERATORS.OPERATOR_TYPES_1;
+        case 'link':
+          return OPERATORS.OPERATOR_TYPES_1;
+        case 'date':
+          return OPERATORS.OPERATOR_TYPES_4;
+        case 'checkbox':
+          return OPERATORS.OPERATOR_TYPES_1;
+        default:
+          return OPERATORS.OPERATOR_TYPES_1;
+      }
+    },
+    customAttributeInputType(key) {
+      switch (key) {
+        case 'date':
+          return 'date';
+        default:
+          return 'plain_text';
+      }
+    },
+    getAttributeModel(key) {
+      const type = this.filterTypes.find(filter => filter.attributeKey === key);
+      return type.attributeModel;
+    },
     getInputType(key) {
       const type = this.filterTypes.find(filter => filter.attributeKey === key);
       return type.inputType;
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index b0801935f..d6cf68788 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -64,7 +64,7 @@
       <contacts-advanced-filters
         v-if="showFiltersModal"
         :on-close="onToggleFilters"
-        :filter-types="contactFilterItems"
+        :initial-filter-types="contactFilterItems"
         @applyFilter="onApplyFilter"
         @clearFilters="clearFilters"
       />
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
index fae8ac456..dc12d2640 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
@@ -1,27 +1,14 @@
+import {
+  OPERATOR_TYPES_1,
+  OPERATOR_TYPES_3,
+} from 'dashboard/components/widgets/FilterInput/FilterOperatorTypes.js';
 const filterTypes = [
   {
     attributeKey: 'name',
     attributeI18nKey: 'NAME',
     inputType: 'plain_text',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'contains',
-        label: 'Contains',
-      },
-      {
-        value: 'does_not_contain',
-        label: 'Does not contain',
-      },
-    ],
+    filterOperators: OPERATOR_TYPES_1,
     attribute_type: 'standard',
   },
   {
@@ -29,24 +16,7 @@ const filterTypes = [
     attributeI18nKey: 'EMAIL',
     inputType: 'plain_text',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'contains',
-        label: 'Contains',
-      },
-      {
-        value: 'does_not_contain',
-        label: 'Does not contain',
-      },
-    ],
+    filterOperators: OPERATOR_TYPES_3,
     attribute_type: 'standard',
   },
   {
@@ -54,24 +24,7 @@ const filterTypes = [
     attributeI18nKey: 'PHONE_NUMBER',
     inputType: 'plain_text',
     dataType: 'text',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'contains',
-        label: 'Contains',
-      },
-      {
-        value: 'does_not_contain',
-        label: 'Does not contain',
-      },
-    ],
+    filterOperators: OPERATOR_TYPES_3,
     attribute_type: 'standard',
   },
   {
@@ -79,16 +32,7 @@ const filterTypes = [
     attributeI18nKey: 'IDENTIFIER',
     inputType: 'plain_text',
     dataType: 'number',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-    ],
+    filterOperators: OPERATOR_TYPES_1,
     attribute_type: 'standard',
   },
   {
@@ -96,16 +40,7 @@ const filterTypes = [
     attributeI18nKey: 'COUNTRY',
     inputType: 'search_select',
     dataType: 'number',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-    ],
+    filterOperators: OPERATOR_TYPES_1,
     attribute_type: 'standard',
   },
   {
@@ -113,26 +48,42 @@ const filterTypes = [
     attributeI18nKey: 'CITY',
     inputType: 'plain_text',
     dataType: 'Number',
-    filterOperators: [
-      {
-        value: 'equal_to',
-        label: 'Equal to',
-      },
-      {
-        value: 'not_equal_to',
-        label: 'Not equal to',
-      },
-      {
-        value: 'contains',
-        label: 'Contains',
-      },
-      {
-        value: 'does_not_contain',
-        label: 'Does not contain',
-      },
-    ],
+    filterOperators: OPERATOR_TYPES_3,
     attribute_type: 'standard',
   },
 ];
 
+export const filterAttributeGroups = [
+  {
+    name: 'Standard Filters',
+    i18nGroup: 'STANDARD_FILTERS',
+    attributes: [
+      {
+        key: 'name',
+        i18nKey: 'NAME',
+      },
+      {
+        key: 'email',
+        i18nKey: 'EMAIL',
+      },
+      {
+        key: 'phone_number',
+        i18nKey: 'PHONE_NUMBER',
+      },
+      {
+        key: 'identifier',
+        i18nKey: 'IDENTIFIER',
+      },
+      {
+        key: 'country_code',
+        i18nKey: 'COUNTRY',
+      },
+      {
+        key: 'city',
+        i18nKey: 'CITY',
+      },
+    ],
+  },
+];
+
 export default filterTypes;
diff --git a/app/javascript/shared/mixins/filterMixin.js b/app/javascript/shared/mixins/filterMixin.js
new file mode 100644
index 000000000..801fb2f08
--- /dev/null
+++ b/app/javascript/shared/mixins/filterMixin.js
@@ -0,0 +1,44 @@
+// import groupBy from 'lodash.groupby';
+
+export default {
+  methods: {
+    setFilterAttributes() {
+      const allCustomAttributes = this.$store.getters[
+        'attributes/getAttributesByModel'
+      ](this.attributeModel);
+      const customAttributesFormatted = {
+        name: this.$t(`${this.filtersFori18n}.GROUPS.CUSTOM_ATTRIBUTES`),
+        attributes: allCustomAttributes.map(attr => {
+          return {
+            key: attr.attribute_key,
+            name: attr.attribute_display_name,
+          };
+        }),
+      };
+      const allFilterGroups = this.filterAttributeGroups.map(group => {
+        return {
+          name: this.$t(`${this.filtersFori18n}.GROUPS.${group.i18nGroup}`),
+          attributes: group.attributes.map(attribute => {
+            return {
+              key: attribute.key,
+              name: this.$t(
+                `${this.filtersFori18n}.ATTRIBUTES.${attribute.i18nKey}`
+              ),
+            };
+          }),
+        };
+      });
+      const customAttributeTypes = allCustomAttributes.map(attr => {
+        return {
+          attributeKey: attr.attribute_key,
+          attributeI18nKey: `CUSTOM_ATTRIBUTE_${attr.attribute_display_type.toUpperCase()}`,
+          inputType: this.customAttributeInputType(attr.attribute_display_type),
+          filterOperators: this.getOperatorTypes(attr.attribute_display_type),
+          attributeModel: 'custom_attributes',
+        };
+      });
+      this.filterTypes = [...this.filterTypes, ...customAttributeTypes];
+      this.filterGroups = [...allFilterGroups, customAttributesFormatted];
+    },
+  },
+};
diff --git a/app/javascript/shared/mixins/specs/MockComponent.vue b/app/javascript/shared/mixins/specs/MockComponent.vue
new file mode 100644
index 000000000..1d1012c3a
--- /dev/null
+++ b/app/javascript/shared/mixins/specs/MockComponent.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="test"></div>
+</template>
+
+<script>
+export default {
+  name: 'MockComponent',
+};
+</script>
diff --git a/app/javascript/shared/mixins/specs/filterFixtures.js b/app/javascript/shared/mixins/specs/filterFixtures.js
new file mode 100644
index 000000000..6bacc4456
--- /dev/null
+++ b/app/javascript/shared/mixins/specs/filterFixtures.js
@@ -0,0 +1,29 @@
+export const filterGroups = [
+  {
+    name: 'Standard Filters',
+    attributes: [
+      { key: 'status', name: 'Status' },
+      { key: 'assignee_id', name: 'Assignee Name' },
+      { key: 'inbox_id', name: 'Inbox Name' },
+      { key: 'team_id', name: 'Team Name' },
+      { key: 'display_id', name: 'Conversation Identifier' },
+      { key: 'campaign_id', name: 'Campaign Name' },
+      { key: 'labels', name: 'Labels' },
+    ],
+  },
+  {
+    name: 'Additional Filters',
+    attributes: [
+      { key: 'browser_language', name: 'Browser Language' },
+      { key: 'country_code', name: 'Country Name' },
+      { key: 'referer', name: 'Referer link' },
+    ],
+  },
+  {
+    name: 'Custom Attributes',
+    attributes: [
+      { key: 'signed_up_at', name: 'Signed Up At' },
+      { key: 'test', name: 'Test' },
+    ],
+  },
+];
diff --git a/app/javascript/shared/mixins/specs/filterMixin.spec.js b/app/javascript/shared/mixins/specs/filterMixin.spec.js
new file mode 100644
index 000000000..94fe95ea7
--- /dev/null
+++ b/app/javascript/shared/mixins/specs/filterMixin.spec.js
@@ -0,0 +1,13 @@
+import filterMixin from '../filterMixin';
+import { shallowMount } from '@vue/test-utils';
+import MockComponent from './MockComponent.vue';
+
+describe('Test mixin function', () => {
+  const wrapper = shallowMount(MockComponent, {
+    mixins: [filterMixin],
+  });
+
+  it('should return proper value from bool', () => {
+    expect(wrapper.vm.setFilterAttributes).toBeTruthy();
+  });
+});

From c0276d252aaa8466faa870fa8aa3678266d2d1ec Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Tue, 1 Feb 2022 16:01:25 +0530
Subject: [PATCH 045/101] chore: add aws rds root cert for tls connection
 (#3812)

* chore: add aws rds cert for tls connection

* add aws rds ca cert

* remove intermediate ca cert
---
 config/rds-ca-2019-root.pem | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 config/rds-ca-2019-root.pem

diff --git a/config/rds-ca-2019-root.pem b/config/rds-ca-2019-root.pem
new file mode 100644
index 000000000..fd4bc861a
--- /dev/null
+++ b/config/rds-ca-2019-root.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEBjCCAu6gAwIBAgIJAMc0ZzaSUK51MA0GCSqGSIb3DQEBCwUAMIGPMQswCQYD
+VQQGEwJVUzEQMA4GA1UEBwwHU2VhdHRsZTETMBEGA1UECAwKV2FzaGluZ3RvbjEi
+MCAGA1UECgwZQW1hem9uIFdlYiBTZXJ2aWNlcywgSW5jLjETMBEGA1UECwwKQW1h
+em9uIFJEUzEgMB4GA1UEAwwXQW1hem9uIFJEUyBSb290IDIwMTkgQ0EwHhcNMTkw
+ODIyMTcwODUwWhcNMjQwODIyMTcwODUwWjCBjzELMAkGA1UEBhMCVVMxEDAOBgNV
+BAcMB1NlYXR0bGUxEzARBgNVBAgMCldhc2hpbmd0b24xIjAgBgNVBAoMGUFtYXpv
+biBXZWIgU2VydmljZXMsIEluYy4xEzARBgNVBAsMCkFtYXpvbiBSRFMxIDAeBgNV
+BAMMF0FtYXpvbiBSRFMgUm9vdCAyMDE5IENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEArXnF/E6/Qh+ku3hQTSKPMhQQlCpoWvnIthzX6MK3p5a0eXKZ
+oWIjYcNNG6UwJjp4fUXl6glp53Jobn+tWNX88dNH2n8DVbppSwScVE2LpuL+94vY
+0EYE/XxN7svKea8YvlrqkUBKyxLxTjh+U/KrGOaHxz9v0l6ZNlDbuaZw3qIWdD/I
+6aNbGeRUVtpM6P+bWIoxVl/caQylQS6CEYUk+CpVyJSkopwJlzXT07tMoDL5WgX9
+O08KVgDNz9qP/IGtAcRduRcNioH3E9v981QO1zt/Gpb2f8NqAjUUCUZzOnij6mx9
+McZ+9cWX88CRzR0vQODWuZscgI08NvM69Fn2SQIDAQABo2MwYTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUc19g2LzLA5j0Kxc0LjZa
+pmD/vB8wHwYDVR0jBBgwFoAUc19g2LzLA5j0Kxc0LjZapmD/vB8wDQYJKoZIhvcN
+AQELBQADggEBAHAG7WTmyjzPRIM85rVj+fWHsLIvqpw6DObIjMWokpliCeMINZFV
+ynfgBKsf1ExwbvJNzYFXW6dihnguDG9VMPpi2up/ctQTN8tm9nDKOy08uNZoofMc
+NUZxKCEkVKZv+IL4oHoeayt8egtv3ujJM6V14AstMQ6SwvwvA93EP/Ug2e4WAXHu
+cbI1NAbUgVDqp+DRdfvZkgYKryjTWd/0+1fS8X1bBZVWzl7eirNVnHbSH2ZDpNuY
+0SBd8dj5F6ld3t58ydZbrTHze7JJOd8ijySAp4/kiu9UfZWuTPABzDa/DSdz9Dk/
+zPW4CXXvhLmE02TA9/HeCw3KEHIwicNuEfw=
+-----END CERTIFICATE-----

From 1f3c5002b34c82327922c0e60b81e47fa1a5c323 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 1 Feb 2022 16:34:54 +0530
Subject: [PATCH 046/101] feat: Shows agent avatar for message sent by agent
 (#3884)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../scss/widgets/_conversation-view.scss      |  6 +++
 .../widgets/conversation/Message.vue          | 47 ++++++++++++-------
 .../i18n/locale/en/conversation.json          |  1 +
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 1be9e31e0..3066d0e43 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -228,8 +228,14 @@
     @include flex-align(right, null);
 
     .wrap {
+      align-items: flex-end;
+      display: flex;
       margin-right: $space-normal;
       text-align: right;
+
+      .sender--info {
+        padding: var(--space-small) 0 var(--space-smaller) var(--space-small);
+      }
     }
 
     .bubble {
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index a79d4150f..97fda5bcf 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -57,22 +57,26 @@
         />
       </div>
       <spinner v-if="isPending" size="tiny" />
-      <a
-        v-if="isATweet && isIncoming && sender"
+      <div
+        v-if="showAvatar"
+        v-tooltip.top="tooltipForSender"
         class="sender--info"
-        :href="twitterProfileLink"
-        target="_blank"
-        rel="noopener noreferrer nofollow"
       >
         <woot-thumbnail
           :src="sender.thumbnail"
           :username="sender.name"
           size="16px"
         />
-        <div class="sender--available-name">
+        <a
+          v-if="isATweet && isIncoming"
+          class="sender--available-name"
+          :href="twitterProfileLink"
+          target="_blank"
+          rel="noopener noreferrer nofollow"
+        >
           {{ sender.name }}
-        </div>
-      </a>
+        </a>
+      </div>
       <div v-if="isFailed" class="message-failed--alert">
         <woot-button
           v-tooltip.top-end="$t('CONVERSATION.TRY_AGAIN')"
@@ -113,7 +117,6 @@ import BubbleActions from './bubble/Actions';
 import Spinner from 'shared/components/Spinner';
 import ContextMenu from 'dashboard/modules/conversations/components/MessageContextMenu';
 
-import { isEmptyObject } from 'dashboard/helper/commons';
 import alertMixin from 'shared/mixins/alertMixin';
 import contentTypeMixin from 'shared/mixins/contentTypeMixin';
 import { MESSAGE_TYPE, MESSAGE_STATUS } from 'shared/constants/messages';
@@ -242,6 +245,9 @@ export default {
     isIncoming() {
       return this.data.message_type === MESSAGE_TYPE.INCOMING;
     },
+    isOutgoing() {
+      return this.data.message_type === MESSAGE_TYPE.OUTGOING;
+    },
     emailHeadAttributes() {
       return {
         email: this.contentAttributes.email,
@@ -258,6 +264,15 @@ export default {
     hasText() {
       return !!this.data.content;
     },
+    tooltipForSender() {
+      const { name = this.$t('CONVERSATION.BOT') } = this.sender || {};
+      return this.data.message_type === MESSAGE_TYPE.OUTGOING
+        ? {
+            content: `${this.$t('CONVERSATION.SENT_BY')} ${name}`,
+            classes: 'top',
+          }
+        : false;
+    },
     messageToolTip() {
       if (this.isMessageDeleted) {
         return false;
@@ -265,13 +280,7 @@ export default {
       if (this.isFailed) {
         return this.$t(`CONVERSATION.SEND_FAILED`);
       }
-      const { sender } = this;
-      return this.data.message_type === 1 && !isEmptyObject(sender)
-        ? {
-            content: `${this.$t('CONVERSATION.SENT_BY')} ${sender.name}`,
-            classes: 'top',
-          }
-        : false;
+      return false;
     },
     wrapClass() {
       return {
@@ -313,6 +322,12 @@ export default {
       const { meta } = this.data;
       return meta ? meta.error : '';
     },
+    showAvatar() {
+      if (this.isOutgoing) {
+        return this.sender;
+      }
+      return this.isATweet && this.isIncoming && this.sender;
+    },
   },
   watch: {
     data() {
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 80b085fc9..e3cf94b83 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -90,6 +90,7 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
     "SEND_FAILED": "Couldn't send message! Try again",
     "TRY_AGAIN": "retry",
     "ASSIGNMENT": {

From 91b9168fae5ae12ae16e6dbc0d3efa04f97bd614 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 2 Feb 2022 18:46:07 +0530
Subject: [PATCH 047/101] feat: Add the ability to add new automation rule 
 (#3459)

* Add automation modal

* Fix the v-model for automations

* Actions and Condition dropdowns for automations

* Fix merge conflicts

* Handle event change and confirmation

* Appends new action

* Removes actions

* Automation api integration

* Api integration for creating automations

* Registers vuex module to the global store

* Automations table

* Updarted labels and actions

* Integrate automation api

* Fixes the mutation error - removed the data key wrapper

* Fixed the automation condition models to work with respective event types

* Remove temporary fixes added to the api request

* Displa timestamp and automation status values

* Added the clone buton

* Removed uncessary helper method

* Specs for automations

* Handle WIP code

* Remove the payload wrap

* Fix the action query payload

* Removed unnecessary files

* Disabled Automations routes

* Ability to delete automations

* Fix specs

* Fixed merge conflicts

Co-authored-by: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Co-authored-by: fayazara <fayazara@gmail.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .codeclimate.yml                              |   1 +
 app/javascript/dashboard/api/automation.js    |   9 +
 .../dashboard/api/specs/automation.spec.js    |  14 +
 .../layout/config/sidebarItems/settings.js    |   2 +-
 .../widgets/AutomationActionInput.vue         | 182 +++++++
 .../components/widgets/FilterInput/Index.vue  |   8 +-
 .../dashboard/helper/actionQueryGenerator.js  |  17 +
 .../helper/specs/actionQueryGenerator.spec.js |  41 ++
 .../dashboard/i18n/locale/en/automation.json  |  78 ++-
 .../settings/automation/AddAutomationRule.vue | 446 ++++++++++++++++++
 .../dashboard/settings/automation/Index.vue   | 202 +++++++-
 .../settings/automation/automation.routes.js  |   2 +-
 .../settings/automation/constants.js          | 229 +++++++++
 .../dashboard/settings/settings.routes.js     |   2 +
 app/javascript/dashboard/store/index.js       |   2 +
 .../dashboard/store/modules/automations.js    |  89 ++++
 .../modules/specs/automations/actions.spec.js |  94 ++++
 .../modules/specs/automations/fixtures.js     |  64 +++
 .../modules/specs/automations/getters.spec.js |  25 +
 .../specs/automations/mutations.spec.js       |  58 +++
 .../dashboard/store/mutation-types.js         |   7 +
 .../FluentIcon/dashboard-icons.json           |  30 +-
 app/listeners/automation_rule_listener.rb     |   2 +-
 23 files changed, 1593 insertions(+), 11 deletions(-)
 create mode 100644 app/javascript/dashboard/api/automation.js
 create mode 100644 app/javascript/dashboard/api/specs/automation.spec.js
 create mode 100644 app/javascript/dashboard/components/widgets/AutomationActionInput.vue
 create mode 100644 app/javascript/dashboard/helper/actionQueryGenerator.js
 create mode 100644 app/javascript/dashboard/helper/specs/actionQueryGenerator.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
 create mode 100644 app/javascript/dashboard/store/modules/automations.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/automations/fixtures.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/automations/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 6b9e1a78f..2799086e3 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -47,4 +47,5 @@ exclude_patterns:
   - 'app/javascript/shared/constants/countries.js'
   - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js'
   - 'app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js'
+  - 'app/javascript/dashboard/routes/dashboard/settings/automation/constants.js'
   - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
diff --git a/app/javascript/dashboard/api/automation.js b/app/javascript/dashboard/api/automation.js
new file mode 100644
index 000000000..3c354307d
--- /dev/null
+++ b/app/javascript/dashboard/api/automation.js
@@ -0,0 +1,9 @@
+import ApiClient from './ApiClient';
+
+class AutomationsAPI extends ApiClient {
+  constructor() {
+    super('automation_rules', { accountScoped: true });
+  }
+}
+
+export default new AutomationsAPI();
diff --git a/app/javascript/dashboard/api/specs/automation.spec.js b/app/javascript/dashboard/api/specs/automation.spec.js
new file mode 100644
index 000000000..c236b5ce3
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/automation.spec.js
@@ -0,0 +1,14 @@
+import automations from '../automation';
+import ApiClient from '../ApiClient';
+
+describe('#AutomationsAPI', () => {
+  it('creates correct instance', () => {
+    expect(automations).toBeInstanceOf(ApiClient);
+    expect(automations).toHaveProperty('get');
+    expect(automations).toHaveProperty('show');
+    expect(automations).toHaveProperty('create');
+    expect(automations).toHaveProperty('update');
+    expect(automations).toHaveProperty('delete');
+    expect(automations.url).toBe('/api/v1/automation_rules');
+  });
+});
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 3c872f25d..176fd152c 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -70,7 +70,7 @@ const settings = accountId => ({
       toStateName: 'attributes_list',
     },
     {
-      icon: 'autocorrect',
+      icon: 'automation',
       label: 'AUTOMATION',
       hasSubMenu: false,
       toState: frontendURL(`accounts/${accountId}/settings/automation/list`),
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
new file mode 100644
index 000000000..22521af91
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -0,0 +1,182 @@
+<template>
+  <div
+    class="filter"
+    :class="{ error: v.action_params.$dirty && v.action_params.$error }"
+  >
+    <div class="filter-inputs">
+      <select
+        v-model="action_name"
+        class="action__question"
+        @change="resetFilter()"
+      >
+        <option
+          v-for="attribute in actionTypes"
+          :key="attribute.key"
+          :value="attribute.key"
+        >
+          {{ attribute.label }}
+        </option>
+      </select>
+      <div class="filter__answer--wrap">
+        <div class="multiselect-wrap--small">
+          <multiselect
+            v-model="action_params"
+            track-by="id"
+            label="name"
+            :placeholder="'Select'"
+            :multiple="true"
+            selected-label
+            :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
+            deselect-label=""
+            :max-height="160"
+            :options="dropdownValues"
+            :allow-empty="false"
+          />
+        </div>
+      </div>
+      <woot-button
+        icon="dismiss"
+        variant="clear"
+        color-scheme="secondary"
+        @click="removeAction"
+      />
+    </div>
+    <p
+      v-if="v.action_params.$dirty && v.action_params.$error"
+      class="filter-error"
+    >
+      {{ $t('FILTER.EMPTY_VALUE_ERROR') }}
+    </p>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: Object,
+      default: () => null,
+    },
+    actionTypes: {
+      type: Array,
+      default: () => [],
+    },
+    dropdownValues: {
+      type: Array,
+      default: () => [],
+    },
+    v: {
+      type: Object,
+      default: () => null,
+    },
+  },
+  computed: {
+    action_name: {
+      get() {
+        if (!this.value) return null;
+        return this.value.action_name;
+      },
+      set(value) {
+        const payload = this.value || {};
+        this.$emit('input', { ...payload, action_name: value });
+      },
+    },
+    action_params: {
+      get() {
+        if (!this.value) return null;
+        return this.value.action_params;
+      },
+      set(value) {
+        const payload = this.value || {};
+        this.$emit('input', { ...payload, action_params: value });
+      },
+    },
+  },
+  methods: {
+    removeAction() {
+      this.$emit('removeAction');
+    },
+    resetFilter() {
+      this.$emit('resetFilter');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.filter {
+  background: var(--color-background);
+  padding: var(--space-small);
+  border: 1px solid var(--color-border);
+  border-radius: var(--border-radius-medium);
+  margin-bottom: var(--space-small);
+}
+
+.filter.error {
+  background: var(--r-50);
+}
+
+.filter-inputs {
+  display: flex;
+}
+
+.filter-error {
+  color: var(--r-500);
+  display: block;
+  margin: var(--space-smaller) 0;
+}
+
+.action__question,
+.filter__operator {
+  margin-bottom: var(--space-zero);
+  margin-right: var(--space-smaller);
+}
+
+.action__question {
+  max-width: 50%;
+}
+
+.filter__answer--wrap {
+  margin-right: var(--space-smaller);
+  flex-grow: 1;
+
+  input {
+    margin-bottom: 0;
+  }
+}
+.filter__answer {
+  &.answer--text-input {
+    margin-bottom: var(--space-zero);
+  }
+}
+
+.filter__join-operator-wrap {
+  position: relative;
+  z-index: var(--z-index-twenty);
+  margin: var(--space-zero);
+}
+
+.filter__join-operator {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  margin: var(--space-one) var(--space-zero);
+
+  .operator__line {
+    position: absolute;
+    width: 100%;
+    border-bottom: 1px solid var(--color-border);
+  }
+
+  .operator__select {
+    position: relative;
+    width: auto;
+    margin-bottom: var(--space-zero) !important;
+  }
+}
+
+.multiselect {
+  margin-bottom: var(--space-zero);
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
index a64425393..d26467ab6 100644
--- a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
+++ b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="filters">
-    <div class="filter">
+    <div class="filter" :class="{ error: v.values.$dirty && v.values.$error }">
       <div class="filter-inputs">
         <select
           v-if="groupedFilters"
@@ -163,7 +163,7 @@ export default {
     },
     groupedFilters: {
       type: Boolean,
-      default: true,
+      default: false,
     },
     filterGroups: {
       type: Array,
@@ -230,6 +230,10 @@ export default {
   border-radius: var(--border-radius-medium);
 }
 
+.filter.error {
+  background: var(--r-50);
+}
+
 .filter-inputs {
   display: flex;
 }
diff --git a/app/javascript/dashboard/helper/actionQueryGenerator.js b/app/javascript/dashboard/helper/actionQueryGenerator.js
new file mode 100644
index 000000000..f5ff7c19e
--- /dev/null
+++ b/app/javascript/dashboard/helper/actionQueryGenerator.js
@@ -0,0 +1,17 @@
+const generatePayload = data => {
+  let payload = data.map(item => {
+    if (Array.isArray(item.action_params)) {
+      item.action_params = item.action_params.map(val => val.id);
+    } else if (typeof item.values === 'object') {
+      item.action_params = [item.action_params.id];
+    } else if (!item.action_params) {
+      item.action_params = [];
+    } else {
+      item.action_params = [item.action_params];
+    }
+    return item;
+  });
+  return payload;
+};
+
+export default generatePayload;
diff --git a/app/javascript/dashboard/helper/specs/actionQueryGenerator.spec.js b/app/javascript/dashboard/helper/specs/actionQueryGenerator.spec.js
new file mode 100644
index 000000000..1041b2d8a
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/actionQueryGenerator.spec.js
@@ -0,0 +1,41 @@
+import actionQueryGenerator from '../actionQueryGenerator';
+
+const testData = [
+  {
+    action_name: 'add_label',
+    action_params: [{ id: 'testlabel', name: 'testlabel' }],
+  },
+  {
+    action_name: 'assign_team',
+    action_params: [
+      {
+        id: 1,
+        name: 'sales team',
+        description: 'This is our internal sales team',
+        allow_auto_assign: true,
+        account_id: 1,
+        is_member: true,
+      },
+    ],
+  },
+];
+
+const finalResult = [
+  {
+    action_name: 'add_label',
+    action_params: ['testlabel'],
+  },
+  {
+    action_name: 'assign_team',
+    action_params: [1],
+  },
+];
+
+describe('#actionQueryGenerator', () => {
+  it('returns the correct format of filter query', () => {
+    expect(actionQueryGenerator(testData)).toEqual(finalResult);
+    expect(
+      actionQueryGenerator(testData).every(i => Array.isArray(i.action_params))
+    ).toBe(true);
+  });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/automation.json b/app/javascript/dashboard/i18n/locale/en/automation.json
index c3614a990..fa0dda7fc 100644
--- a/app/javascript/dashboard/i18n/locale/en/automation.json
+++ b/app/javascript/dashboard/i18n/locale/en/automation.json
@@ -1,6 +1,82 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Edit",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
new file mode 100644
index 000000000..d26a5695b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -0,0 +1,446 @@
+<template>
+  <div class="column">
+    <woot-modal-header :header-title="$t('AUTOMATION.ADD.TITLE')" />
+    <div class="row modal-content">
+      <div class="medium-12 columns">
+        <woot-input
+          v-model="automation.name"
+          :label="$t('AUTOMATION.ADD.FORM.NAME.LABEL')"
+          type="text"
+          :class="{ error: $v.automation.name.$error }"
+          :error="
+            $v.automation.name.$error
+              ? $t('AUTOMATION.ADD.FORM.NAME.ERROR')
+              : ''
+          "
+          :placeholder="$t('AUTOMATION.ADD.FORM.NAME.PLACEHOLDER')"
+          @blur="$v.automation.name.$touch"
+        />
+        <woot-input
+          v-model="automation.description"
+          :label="$t('AUTOMATION.ADD.FORM.DESC.LABEL')"
+          type="text"
+          :class="{ error: $v.automation.description.$error }"
+          :error="
+            $v.automation.description.$error
+              ? $t('AUTOMATION.ADD.FORM.DESC.ERROR')
+              : ''
+          "
+          :placeholder="$t('AUTOMATION.ADD.FORM.DESC.PLACEHOLDER')"
+          @blur="$v.automation.description.$touch"
+        />
+        <div class="event_wrapper">
+          <label :class="{ error: $v.automation.event_name.$error }">
+            {{ $t('AUTOMATION.ADD.FORM.EVENT.LABEL') }}
+            <select v-model="automation.event_name" @change="onEventChange()">
+              <option
+                v-for="event in automationRuleEvents"
+                :key="event.key"
+                :value="event.key"
+              >
+                {{ event.value }}
+              </option>
+            </select>
+            <span v-if="$v.automation.event_name.$error" class="message">
+              {{ $t('AUTOMATION.ADD.FORM.EVENT.ERROR') }}
+            </span>
+          </label>
+          <p v-if="hasAutomationMutated" class="info-message">
+            {{ $t('AUTOMATION.FORM.RESET_MESSAGE') }}
+          </p>
+        </div>
+        <!-- // Conditions Start -->
+        <section>
+          <label>
+            {{ $t('AUTOMATION.ADD.FORM.CONDITIONS.LABEL') }}
+          </label>
+          <div class="medium-12 columns filters-wrap">
+            <filter-input-box
+              v-for="(condition, i) in automation.conditions"
+              :key="i"
+              v-model="automation.conditions[i]"
+              :filter-attributes="getAttributes(automation.event_name)"
+              :input-type="getInputType(automation.conditions[i].attribute_key)"
+              :operators="getOperators(automation.conditions[i].attribute_key)"
+              :dropdown-values="
+                getConditionDropdownValues(
+                  automation.conditions[i].attribute_key
+                )
+              "
+              :show-query-operator="i !== automation.conditions.length - 1"
+              :v="$v.automation.conditions.$each[i]"
+              @resetFilter="resetFilter(i, automation.conditions[i])"
+              @removeFilter="removeFilter(i)"
+            />
+            <div class="filter-actions">
+              <woot-button
+                icon="add"
+                color-scheme="success"
+                variant="smooth"
+                size="small"
+                @click="appendNewCondition"
+              >
+                {{ $t('AUTOMATION.ADD.CONDITION_BUTTON_LABEL') }}
+              </woot-button>
+            </div>
+          </div>
+        </section>
+        <!-- // Conditions End -->
+        <!-- // Actions Start -->
+        <section>
+          <label>
+            {{ $t('AUTOMATION.ADD.FORM.ACTIONS.LABEL') }}
+          </label>
+          <div class="medium-12 columns filters-wrap">
+            <automation-action-input
+              v-for="(action, i) in automation.actions"
+              :key="i"
+              v-model="automation.actions[i]"
+              :action-types="automationActionTypes"
+              :dropdown-values="
+                getActionDropdownValues(automation.actions[i].action_name)
+              "
+              :v="$v.automation.actions.$each[i]"
+              @removeAction="removeAction(i)"
+            />
+            <div class="filter-actions">
+              <woot-button
+                icon="add"
+                color-scheme="success"
+                variant="smooth"
+                size="small"
+                @click="appendNewAction"
+              >
+                {{ $t('AUTOMATION.ADD.ACTION_BUTTON_LABEL') }}
+              </woot-button>
+            </div>
+          </div>
+        </section>
+        <!-- // Actions End -->
+        <div class="medium-12 columns">
+          <div class="modal-footer justify-content-end w-full">
+            <woot-button class="button clear" @click.prevent="onClose">
+              {{ $t('AUTOMATION.ADD.CANCEL_BUTTON_TEXT') }}
+            </woot-button>
+            <woot-button @click="submitAutomation">
+              {{ $t('AUTOMATION.ADD.SUBMIT') }}
+            </woot-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import alertMixin from 'shared/mixins/alertMixin';
+import { required, requiredIf } from 'vuelidate/lib/validators';
+import filterInputBox from 'dashboard/components/widgets/FilterInput/Index.vue';
+import automationActionInput from 'dashboard/components/widgets/AutomationActionInput.vue';
+import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
+import countries from '/app/javascript/shared/constants/countries.js';
+import {
+  AUTOMATION_RULE_EVENTS,
+  AUTOMATION_ACTION_TYPES,
+  AUTOMATIONS,
+} from './constants';
+import filterQueryGenerator from 'dashboard/helper/filterQueryGenerator.js';
+import actionQueryGenerator from 'dashboard/helper/actionQueryGenerator.js';
+
+export default {
+  components: {
+    filterInputBox,
+    automationActionInput,
+  },
+  mixins: [alertMixin],
+  props: {
+    onClose: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  validations: {
+    automation: {
+      name: {
+        required,
+      },
+      description: {
+        required,
+      },
+      event_name: {
+        required,
+      },
+      conditions: {
+        required,
+        $each: {
+          values: {
+            required: requiredIf(prop => {
+              return !(
+                prop.filter_operator === 'is_present' ||
+                prop.filter_operator === 'is_not_present'
+              );
+            }),
+          },
+        },
+      },
+      actions: {
+        required,
+        $each: {
+          action_params: {
+            required,
+          },
+        },
+      },
+    },
+  },
+  data() {
+    return {
+      automationTypes: AUTOMATIONS,
+      automationRuleEvent: AUTOMATION_RULE_EVENTS[0].key,
+      automationRuleEvents: AUTOMATION_RULE_EVENTS,
+      automationActionTypes: AUTOMATION_ACTION_TYPES,
+      automationMutated: false,
+      show: true,
+      automation: {
+        name: null,
+        description: null,
+        event_name: 'conversation_created',
+        conditions: [
+          {
+            attribute_key: 'status',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          },
+        ],
+        actions: [
+          {
+            action_name: 'assign_team',
+            action_params: [],
+          },
+        ],
+      },
+      showDeleteConfirmationModal: false,
+    };
+  },
+  computed: {
+    conditions() {
+      return this.automationTypes[this.automation.event_name].conditions;
+    },
+    actions() {
+      return this.automationTypes[this.automation.event_name].actions;
+    },
+    filterAttributes() {
+      return this.filterTypes.map(type => {
+        return {
+          key: type.attributeKey,
+          name: type.attributeName,
+          attributeI18nKey: type.attributeI18nKey,
+        };
+      });
+    },
+    hasAutomationMutated() {
+      if (
+        this.automation.conditions[0].values ||
+        this.automation.actions[0].action_params.length
+      )
+        return true;
+      return false;
+    },
+  },
+  methods: {
+    onEventChange() {
+      if (this.automation.event_name === 'message_created') {
+        this.automation.conditions = [
+          {
+            attribute_key: 'message_type',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          },
+        ];
+      } else {
+        this.automation.conditions = [
+          {
+            attribute_key: 'status',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          },
+        ];
+      }
+      this.automation.actions = [
+        {
+          action_name: 'assign_team',
+          action_params: [],
+        },
+      ];
+    },
+    getAttributes(key) {
+      return this.automationTypes[key].conditions;
+    },
+    getInputType(key) {
+      const type = this.automationTypes[
+        this.automation.event_name
+      ].conditions.find(condition => condition.key === key);
+      return type.inputType;
+    },
+    getOperators(key) {
+      const type = this.automationTypes[
+        this.automation.event_name
+      ].conditions.find(condition => condition.key === key);
+      return type.filterOperators;
+    },
+    getConditionDropdownValues(type) {
+      const statusFilters = this.$t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS');
+      switch (type) {
+        case 'status':
+          return [
+            ...Object.keys(statusFilters).map(status => {
+              return {
+                id: status,
+                name: statusFilters[status].TEXT,
+              };
+            }),
+            {
+              id: 'all',
+              name: this.$t('CHAT_LIST.FILTER_ALL'),
+            },
+          ];
+        case 'assignee_id':
+          return this.$store.getters['agents/getAgents'];
+        case 'contact':
+          return this.$store.getters['contacts/getContacts'];
+        case 'inbox_id':
+          return this.$store.getters['inboxes/getInboxes'];
+        case 'team_id':
+          return this.$store.getters['teams/getTeams'];
+        case 'campaign_id':
+          return this.$store.getters['campaigns/getAllCampaigns'].map(i => {
+            return {
+              id: i.id,
+              name: i.title,
+            };
+          });
+        case 'labels':
+          return this.$store.getters['labels/getLabels'].map(i => {
+            return {
+              id: i.id,
+              name: i.title,
+            };
+          });
+        case 'browser_language':
+          return languages;
+        case 'country_code':
+          return countries;
+        case 'message_type':
+          return [
+            {
+              id: 'incoming',
+              name: 'Incoming Message',
+            },
+            {
+              id: 'outgoing',
+              name: 'Outgoing Message',
+            },
+          ];
+        default:
+          return undefined;
+      }
+    },
+    getActionDropdownValues(type) {
+      switch (type) {
+        case 'assign_team':
+        case 'send_message':
+          return this.$store.getters['teams/getTeams'];
+        case 'add_label':
+          return this.$store.getters['labels/getLabels'].map(i => {
+            return {
+              id: i.title,
+              name: i.title,
+            };
+          });
+        default:
+          return undefined;
+      }
+    },
+    appendNewCondition() {
+      this.automation.conditions.push({
+        attribute_key: 'status',
+        filter_operator: 'equal_to',
+        values: '',
+        query_operator: 'and',
+      });
+    },
+    appendNewAction() {
+      this.automation.actions.push({
+        action_name: 'assign_team',
+        action_params: [],
+      });
+    },
+    removeFilter(index) {
+      if (this.automation.conditions.length <= 1) {
+        this.showAlert(this.$t('FILTER.FILTER_DELETE_ERROR'));
+      } else {
+        this.automation.conditions.splice(index, 1);
+      }
+    },
+    removeAction(index) {
+      if (this.automation.actions.length <= 1) {
+        this.showAlert(this.$t('FILTER.FILTER_DELETE_ERROR'));
+      } else {
+        this.automation.actions.splice(index, 1);
+      }
+    },
+    submitAutomation() {
+      this.$v.$touch();
+      if (this.$v.$invalid) return;
+      this.automation.conditions[
+        this.automation.conditions.length - 1
+      ].query_operator = null;
+      this.automation.conditions = filterQueryGenerator(
+        this.automation.conditions
+      ).payload;
+      this.automation.actions = actionQueryGenerator(this.automation.actions);
+      this.$emit('saveAutomation', this.automation);
+    },
+    resetFilter(index, currentCondition) {
+      this.automation.conditions[index].filter_operator = this.automationTypes[
+        this.automation.event_name
+      ].conditions.find(
+        condition => condition.key === currentCondition.attribute_key
+      ).filterOperators[0].value;
+      this.automation.conditions[index].values = '';
+    },
+    showUserInput(operatorType) {
+      if (operatorType === 'is_present' || operatorType === 'is_not_present')
+        return false;
+      return true;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.filters-wrap {
+  padding: var(--space-normal);
+  border-radius: var(--border-radius-large);
+  border: 1px solid var(--color-border);
+  background: var(--color-background-light);
+  margin-bottom: var(--space-normal);
+}
+
+.filter-actions {
+  margin-top: var(--space-normal);
+}
+.event_wrapper {
+  select {
+    margin: 0;
+  }
+  .info-message {
+    font-size: var(--font-size-mini);
+    color: #868686;
+    text-align: right;
+  }
+  margin-bottom: 1.6rem;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 083b51246..39c83c5fe 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -4,9 +4,209 @@
       color-scheme="success"
       class-names="button--fixed-right-top"
       icon="add-circle"
+      @click="openAddPopup()"
     >
       {{ $t('AUTOMATION.HEADER_BTN_TXT') }}
     </woot-button>
+    <div class="row">
+      <div class="small-8 columns with-right-space">
+        <p
+          v-if="!uiFlags.isFetching && !records.length"
+          class="no-items-error-message"
+        >
+          {{ $t('AUTOMATION.LIST.404') }}
+        </p>
+        <woot-loading-state
+          v-if="uiFlags.isFetching"
+          :message="$t('AUTOMATION.LOADING')"
+        />
+        <table v-if="!uiFlags.isFetching && records.length" class="woot-table">
+          <thead>
+            <th
+              v-for="thHeader in $t('AUTOMATION.LIST.TABLE_HEADER')"
+              :key="thHeader"
+            >
+              {{ thHeader }}
+            </th>
+          </thead>
+          <tbody>
+            <tr v-for="(automation, index) in records" :key="index">
+              <td>{{ automation.name }}</td>
+              <td>{{ automation.description }}</td>
+              <td>
+                <fluent-icon
+                  v-if="automation.active"
+                  icon="checkmark-square"
+                  type="solid"
+                />
+                <fluent-icon v-else icon="square" />
+              </td>
+              <td>{{ readableTime(automation.created_on) }}</td>
+              <td class="button-wrapper">
+                <!-- <woot-button
+                  v-tooltip.top="$t('AUTOMATION.FORM.EDIT')"
+                  variant="smooth"
+                  size="tiny"
+                  color-scheme="secondary"
+                  class-names="grey-btn"
+                  :is-loading="loading[automation.id]"
+                  icon="edit"
+                  @click="openEditPopup(automation)"
+                >
+                </woot-button>
+                <woot-button
+                  v-tooltip.top="'Clone'"
+                  variant="smooth"
+                  size="tiny"
+                  color-scheme="primary"
+                  class-names="grey-btn"
+                  :is-loading="loading[automation.id]"
+                  icon="copy"
+                  @click="openEditPopup(automation)"
+                >
+                </woot-button> -->
+                <woot-button
+                  v-tooltip.top="$t('AUTOMATION.FORM.DELETE')"
+                  variant="smooth"
+                  color-scheme="alert"
+                  size="tiny"
+                  icon="dismiss-circle"
+                  class-names="grey-btn"
+                  :is-loading="loading[automation.id]"
+                  @click="openDeletePopup(automation, index)"
+                >
+                </woot-button>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div class="small-4 columns">
+        <span v-html="$t('AUTOMATION.SIDEBAR_TXT')"></span>
+      </div>
+    </div>
+    <woot-modal
+      :show.sync="showAddPopup"
+      size="medium"
+      :on-close="hideAddPopup"
+    >
+      <add-automation-rule
+        v-if="showAddPopup"
+        :on-close="hideAddPopup"
+        @saveAutomation="onCreateAutomation"
+      />
+    </woot-modal>
+
+    <woot-delete-modal
+      :show.sync="showDeleteConfirmationPopup"
+      :on-close="closeDeletePopup"
+      :on-confirm="confirmDeletion"
+      :title="$t('LABEL_MGMT.DELETE.CONFIRM.TITLE')"
+      :message="deleteMessage"
+      :confirm-text="deleteConfirmText"
+      :reject-text="deleteRejectText"
+    />
   </div>
 </template>
-<script></script>
+<script>
+import { mapGetters } from 'vuex';
+import AddAutomationRule from './AddAutomationRule.vue';
+import alertMixin from 'shared/mixins/alertMixin';
+import timeMixin from 'dashboard/mixins/time';
+
+export default {
+  components: {
+    AddAutomationRule,
+  },
+  mixins: [alertMixin, timeMixin],
+  data() {
+    return {
+      loading: {},
+      showAddPopup: false,
+      showEditPopup: false,
+      showDeleteConfirmationPopup: false,
+      selectedResponse: {},
+    };
+  },
+  computed: {
+    ...mapGetters({
+      records: ['automations/getAutomations'],
+      uiFlags: 'automations/getUIFlags',
+    }),
+    // Delete Modal
+    deleteConfirmText() {
+      return `${this.$t('AUTOMATION.DELETE.CONFIRM.YES')} ${
+        this.selectedResponse.name
+      }`;
+    },
+    deleteRejectText() {
+      return `${this.$t('AUTOMATION.DELETE.CONFIRM.NO')} ${
+        this.selectedResponse.name
+      }`;
+    },
+    deleteMessage() {
+      return `${this.$t('AUTOMATION.DELETE.CONFIRM.MESSAGE')} ${
+        this.selectedResponse.name
+      } ?`;
+    },
+  },
+  mounted() {
+    this.$store.dispatch('automations/get');
+  },
+  methods: {
+    openAddPopup() {
+      this.showAddPopup = true;
+    },
+    hideAddPopup() {
+      this.showAddPopup = false;
+    },
+    openEditPopup(response) {
+      this.showEditPopup = true;
+      this.selectedResponse = response;
+    },
+    hideEditPopup() {
+      this.showEditPopup = false;
+    },
+    openDeletePopup(response) {
+      this.showDeleteConfirmationPopup = true;
+      this.selectedResponse = response;
+    },
+    closeDeletePopup() {
+      this.showDeleteConfirmationPopup = false;
+    },
+    confirmDeletion() {
+      this.loading[this.selectedResponse.id] = true;
+      this.closeDeletePopup();
+      this.deleteAutomation(this.selectedResponse.id);
+    },
+    async deleteAutomation(id) {
+      try {
+        await this.$store.dispatch('automations/delete', id);
+        this.showAlert(this.$t('AUTOMATION.DELETE.API.SUCCESS_MESSAGE'));
+        this.loading[this.selectedResponse.id] = false;
+      } catch (error) {
+        this.showAlert(this.$t('AUTOMATION.DELETE.API.ERROR_MESSAGE'));
+      }
+    },
+    async onCreateAutomation(payload) {
+      try {
+        await await this.$store.dispatch('automations/create', payload);
+        this.showAlert(this.$t('AUTOMATION.ADD.API.SUCCESS_MESSAGE'));
+        this.hideAddPopup();
+      } catch (error) {
+        this.showAlert(this.$t('AUTOMATION.ADD.API.ERROR_MESSAGE'));
+      }
+    },
+    readableTime(date) {
+      return this.messageStamp(new Date(date), 'LLL d, h:mm a');
+    },
+  },
+};
+</script>
+
+<style scoped>
+.automation__status-checkbox {
+  margin: 0;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/automation.routes.js b/app/javascript/dashboard/routes/dashboard/settings/automation/automation.routes.js
index 6d751c45a..dbb204261 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/automation.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/automation.routes.js
@@ -9,7 +9,7 @@ export default {
       component: SettingsContent,
       props: {
         headerTitle: 'AUTOMATION.HEADER',
-        icon: 'autocorrect',
+        icon: 'automation',
         showNewButton: false,
       },
       children: [
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
new file mode 100644
index 000000000..62e4bb998
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -0,0 +1,229 @@
+const OPERATOR_TYPES_1 = [
+  {
+    value: 'equal_to',
+    label: 'Equal to',
+  },
+  {
+    value: 'not_equal_to',
+    label: 'Not equal to',
+  },
+];
+
+const OPERATOR_TYPES_2 = [
+  {
+    value: 'equal_to',
+    label: 'Equal to',
+  },
+  {
+    value: 'not_equal_to',
+    label: 'Not equal to',
+  },
+  {
+    value: 'contains',
+    label: 'Contains',
+  },
+  {
+    value: 'does_not_contain',
+    label: 'Does not contain',
+  },
+];
+
+const OPERATOR_TYPES_3 = [
+  {
+    value: 'equal_to',
+    label: 'Equal to',
+  },
+  {
+    value: 'not_equal_to',
+    label: 'Not equal to',
+  },
+  {
+    value: 'is_present',
+    label: 'Is present',
+  },
+  {
+    value: 'is_not_present',
+    label: 'Is not present',
+  },
+];
+
+export const AUTOMATIONS = {
+  message_created: {
+    conditions: [
+      {
+        key: 'message_type',
+        name: 'Message Type',
+        attributeI18nKey: 'MESSAGE_TYPE',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'message_contains',
+        name: 'Message Contains',
+        attributeI18nKey: 'MESSAGE_CONTAINS',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
+    ],
+    actions: [
+      {
+        key: 'assign_team',
+        name: 'Assign a team',
+        attributeI18nKey: 'ASSIGN_TEAM',
+      },
+      {
+        key: 'add_label',
+        name: 'Add a label',
+        attributeI18nKey: 'ADD_LABEL',
+      },
+      {
+        key: 'send_message',
+        name: 'Send an email to team',
+        attributeI18nKey: 'SEND_MESSAGE',
+      },
+    ],
+  },
+  conversation_created: {
+    conditions: [
+      {
+        key: 'status',
+        name: 'Status',
+        attributeI18nKey: 'STATUS',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'browser_language',
+        name: 'Browser Language',
+        attributeI18nKey: 'BROWSER_LANGUAGE',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'country_code',
+        name: 'Country',
+        attributeI18nKey: 'COUNTRY_NAME',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'referrer',
+        name: 'Referrer Link',
+        attributeI18nKey: 'REFERER_LINK',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
+    ],
+    actions: [
+      {
+        key: 'assign_team',
+        name: 'Assign a team',
+        attributeI18nKey: 'ASSIGN_TEAM',
+      },
+      {
+        key: 'send_message',
+        name: 'Send an email to team',
+        attributeI18nKey: 'SEND_MESSAGE',
+      },
+      {
+        key: 'assign_agent',
+        name: 'Assign an agent',
+        attributeI18nKey: 'ASSIGN_AGENT',
+      },
+    ],
+  },
+  conversation_updated: {
+    conditions: [
+      {
+        key: 'status',
+        name: 'Status',
+        attributeI18nKey: 'STATUS',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'browser_language',
+        name: 'Browser Language',
+        attributeI18nKey: 'BROWSER_LANGUAGE',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'country_code',
+        name: 'Country',
+        attributeI18nKey: 'COUNTRY_NAME',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
+      {
+        key: 'referer',
+        name: 'Referrer Link',
+        attributeI18nKey: 'REFERER_LINK',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
+      {
+        key: 'assignee_id',
+        name: 'Assignee',
+        attributeI18nKey: 'ASSIGNEE_NAME',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_3,
+      },
+      {
+        key: 'team_id',
+        name: 'Team',
+        attributeI18nKey: 'TEAM_NAME',
+        inputType: 'search_select',
+        filterOperators: OPERATOR_TYPES_3,
+      },
+    ],
+    actions: [
+      {
+        key: 'assign_team',
+        name: 'Assign a team',
+        attributeI18nKey: 'ASSIGN_TEAM',
+      },
+      {
+        key: 'send_message',
+        name: 'Send an email to team',
+        attributeI18nKey: 'SEND_MESSAGE',
+      },
+      {
+        key: 'assign_agent',
+        name: 'Assign an agent',
+        attributeI18nKey: 'ASSIGN_AGENT',
+        attributeKey: 'assignee_id',
+      },
+    ],
+  },
+};
+
+export const AUTOMATION_RULE_EVENTS = [
+  {
+    key: 'conversation_created',
+    value: 'Conversation Created',
+  },
+  {
+    key: 'conversation_updated',
+    value: 'Conversation Updated',
+  },
+  {
+    key: 'message_created',
+    value: 'Message Created',
+  },
+];
+
+export const AUTOMATION_ACTION_TYPES = [
+  {
+    key: 'assign_team',
+    label: 'Assign a team',
+  },
+  {
+    key: 'add_label',
+    label: 'Add a label',
+  },
+  {
+    key: 'send_message',
+    label: 'Send an email to team',
+  },
+];
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 87910efc8..110f26fba 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -11,6 +11,7 @@ import reports from './reports/reports.routes';
 import campaigns from './campaigns/campaigns.routes';
 import teams from './teams/teams.routes';
 import attributes from './attributes/attributes.routes';
+import automation from './automation/automation.routes';
 import store from '../../../store';
 
 export default {
@@ -38,5 +39,6 @@ export default {
     ...campaigns.routes,
     ...integrationapps.routes,
     ...attributes.routes,
+    ...automation.routes,
   ],
 };
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 77c62848a..88c36cdf8 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -31,6 +31,7 @@ import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
 import attributes from './modules/attributes';
+import automations from './modules/automations';
 import customViews from './modules/customViews';
 
 Vue.use(Vuex);
@@ -66,6 +67,7 @@ export default new Vuex.Store({
     userNotificationSettings,
     webhooks,
     attributes,
+    automations,
     customViews,
   },
 });
diff --git a/app/javascript/dashboard/store/modules/automations.js b/app/javascript/dashboard/store/modules/automations.js
new file mode 100644
index 000000000..405118707
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/automations.js
@@ -0,0 +1,89 @@
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import types from '../mutation-types';
+import AutomationAPI from '../../api/automation';
+
+export const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isCreating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getAutomations(_state) {
+    return _state.records;
+  },
+  getUIFlags(_state) {
+    return _state.uiFlags;
+  },
+};
+
+export const actions = {
+  get: async function getAutomations({ commit }) {
+    commit(types.SET_AUTOMATION_UI_FLAG, { isFetching: true });
+    try {
+      const response = await AutomationAPI.get();
+      commit(types.SET_AUTOMATIONS, response.data.payload);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SET_AUTOMATION_UI_FLAG, { isFetching: false });
+    }
+  },
+  create: async function createAutomation({ commit }, automationObj) {
+    commit(types.SET_AUTOMATION_UI_FLAG, { isCreating: true });
+    try {
+      const response = await AutomationAPI.create(automationObj);
+      commit(types.ADD_AUTOMATION, response.data);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_AUTOMATION_UI_FLAG, { isCreating: false });
+    }
+  },
+  update: async ({ commit }, { id, ...updateObj }) => {
+    commit(types.SET_AUTOMATION_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await AutomationAPI.update(id, updateObj);
+      commit(types.EDIT_AUTOMATION, response.data);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_AUTOMATION_UI_FLAG, { isUpdating: false });
+    }
+  },
+  delete: async ({ commit }, id) => {
+    commit(types.SET_AUTOMATION_UI_FLAG, { isDeleting: true });
+    try {
+      await AutomationAPI.delete(id);
+      commit(types.DELETE_AUTOMATION, id);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_AUTOMATION_UI_FLAG, { isDeleting: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_AUTOMATION_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+  [types.ADD_AUTOMATION]: MutationHelpers.create,
+  [types.SET_AUTOMATIONS]: MutationHelpers.set,
+  // [types.EDIT_AUTOMATION]: MutationHelpers.update,
+  [types.DELETE_AUTOMATION]: MutationHelpers.destroy,
+};
+
+export default {
+  namespaced: true,
+  actions,
+  state,
+  getters,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
new file mode 100644
index 000000000..8dbc08f00
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
@@ -0,0 +1,94 @@
+import axios from 'axios';
+import { actions } from '../../automations';
+import * as types from '../../../mutation-types';
+import automationsList from './fixtures';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: { payload: automationsList } });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isFetching: true }],
+        [types.default.SET_AUTOMATIONS, automationsList],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isFetching: true }],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: automationsList[0] });
+      await actions.create({ commit }, automationsList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isCreating: true }],
+        [types.default.ADD_AUTOMATION, automationsList[0]],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.create({ commit })).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isCreating: true }],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+  // API Work in progress
+  // describe('#update', () => {
+  //   it('sends correct actions if API is success', async () => {
+  //     axios.patch.mockResolvedValue({ data: automationsList[0] });
+  //     await actions.update({ commit }, automationsList[0]);
+  //     expect(commit.mock.calls).toEqual([
+  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: true }],
+  //       [types.default.EDIT_AUTOMATION, automationsList[0]],
+  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: false }],
+  //     ]);
+  //   });
+  //   it('sends correct actions if API is error', async () => {
+  //     axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+  //     await expect(
+  //       actions.update({ commit }, automationsList[0])
+  //     ).rejects.toThrow(Error);
+  //     expect(commit.mock.calls).toEqual([
+  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: true }],
+  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: false }],
+  //     ]);
+  //   });
+  // });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({ data: automationsList[0] });
+      await actions.delete({ commit }, automationsList[0].id);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isDeleting: true }],
+        [types.default.DELETE_AUTOMATION, automationsList[0].id],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.delete({ commit }, automationsList[0].id)
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isDeleting: true }],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/automations/fixtures.js b/app/javascript/dashboard/store/modules/specs/automations/fixtures.js
new file mode 100644
index 000000000..65b55aa73
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/automations/fixtures.js
@@ -0,0 +1,64 @@
+export default [
+  {
+    id: 12,
+    account_id: 1,
+    name: 'Test',
+    description: 'This is a test',
+    event_name: 'conversation_created',
+    conditions: [
+      {
+        values: ['open'],
+        attribute_key: 'status',
+        query_operator: null,
+        filter_operator: 'equal_to',
+      },
+    ],
+    actions: [
+      {
+        action_name: 'add_label',
+        action_params: [{}],
+      },
+    ],
+    created_on: '2022-01-14T09:17:55.689Z',
+    active: true,
+  },
+  {
+    id: 13,
+    account_id: 1,
+    name: 'Auto resolve conversation',
+    description: 'Auto resolves conversation',
+    event_name: 'conversation_updated',
+    conditions: [
+      {
+        values: ['resolved'],
+        attribute_key: 'status',
+        query_operator: null,
+        filter_operator: 'equal_to',
+      },
+    ],
+    actions: [
+      {
+        action_name: 'add_label',
+        action_params: [{}],
+      },
+    ],
+    created_on: '2022-01-14T13:06:31.843Z',
+    active: true,
+  },
+  {
+    id: 14,
+    account_id: 1,
+    name: 'Fayaz',
+    description: 'This is a test',
+    event_name: 'conversation_created',
+    conditions: {},
+    actions: [
+      {
+        action_name: 'add_label',
+        action_params: [{}],
+      },
+    ],
+    created_on: '2022-01-17T06:46:08.098Z',
+    active: true,
+  },
+];
diff --git a/app/javascript/dashboard/store/modules/specs/automations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/automations/getters.spec.js
new file mode 100644
index 000000000..46814f02a
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/automations/getters.spec.js
@@ -0,0 +1,25 @@
+import { getters } from '../../automations';
+import automations from './fixtures';
+describe('#getters', () => {
+  it('getAutomations', () => {
+    const state = { records: automations };
+    expect(getters.getAutomations(state)).toEqual(automations);
+  });
+
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isFetching: true,
+        isCreating: false,
+        isUpdating: false,
+        isDeleting: false,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isFetching: true,
+      isCreating: false,
+      isUpdating: false,
+      isDeleting: false,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js
new file mode 100644
index 000000000..bdb127d0c
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js
@@ -0,0 +1,58 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../automations';
+import automations from './fixtures';
+describe('#mutations', () => {
+  describe('#SET_automations', () => {
+    it('set autonmation records', () => {
+      const state = { records: [] };
+      mutations[types.SET_AUTOMATIONS](state, automations);
+      expect(state.records).toEqual(automations);
+    });
+  });
+
+  describe('#ADD_AUTOMATION', () => {
+    it('push newly created automatuion to the store', () => {
+      const state = { records: [automations[0]] };
+      mutations[types.ADD_AUTOMATION](state, automations[1]);
+      expect(state.records).toEqual([automations[0], automations[1]]);
+    });
+  });
+
+  // describe('#EDIT_AUTOMATION', () => {
+  //   it('update automation record', () => {
+  //     const state = { records: [automations[0]] };
+  //     mutations[types.EDIT_AUTOMATION](state, {
+  //       id: 12,
+  //       account_id: 1,
+  //       name: 'Test Automation',
+  //       description: 'This is a test',
+  //       event_name: 'conversation_created',
+  //       conditions: [
+  //         {
+  //           values: ['open'],
+  //           attribute_key: 'status',
+  //           query_operator: null,
+  //           filter_operator: 'equal_to',
+  //         },
+  //       ],
+  //       actions: [
+  //         {
+  //           action_name: 'add_label',
+  //           action_params: [{}],
+  //         },
+  //       ],
+  //       created_on: '2022-01-14T09:17:55.689Z',
+  //       active: true,
+  //     });
+  //     expect(state.records[0].name).toEqual('Test Automation');
+  //   });
+  // });
+
+  describe('#DELETE_AUTOMATION', () => {
+    it('delete automation record', () => {
+      const state = { records: [automations[0]] };
+      mutations[types.DELETE_AUTOMATION](state, 12);
+      expect(state.records).toEqual([]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index e99412c60..734e0b5e5 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -189,6 +189,13 @@ export default {
   EDIT_CUSTOM_ATTRIBUTE: 'EDIT_CUSTOM_ATTRIBUTE',
   DELETE_CUSTOM_ATTRIBUTE: 'DELETE_CUSTOM_ATTRIBUTE',
 
+  // Automations
+  SET_AUTOMATION_UI_FLAG: 'SET_AUTOMATION_UI_FLAG',
+  SET_AUTOMATIONS: 'SET_AUTOMATIONS',
+  ADD_AUTOMATION: 'ADD_AUTOMATION',
+  EDIT_AUTOMATION: 'EDIT_AUTOMATION',
+  DELETE_AUTOMATION: 'DELETE_AUTOMATION',
+
   // Custom Views
   SET_CUSTOM_VIEW_UI_FLAG: 'SET_CUSTOM_VIEW_UI_FLAG',
   SET_CUSTOM_VIEW: 'SET_CUSTOM_VIEW',
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index a8840937c..46bb92a22 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -14,16 +14,28 @@
   "arrow-up-outline": "M4.21 10.733a.75.75 0 0 0 1.086 1.034l5.954-6.251V20.25a.75.75 0 0 0 1.5 0V5.516l5.955 6.251a.75.75 0 0 0 1.086-1.034l-7.067-7.42a.995.995 0 0 0-.58-.3.754.754 0 0 0-.29.001.995.995 0 0 0-.578.3L4.21 10.733Z",
   "attach-outline": "M11.772 3.743a6 6 0 0 1 8.66 8.302l-.19.197-8.8 8.798-.036.03a3.723 3.723 0 0 1-5.489-4.973.764.764 0 0 1 .085-.13l.054-.06.086-.088.142-.148.002.003 7.436-7.454a.75.75 0 0 1 .977-.074l.084.073a.75.75 0 0 1 .074.976l-.073.084-7.594 7.613a2.23 2.23 0 0 0 3.174 3.106l8.832-8.83A4.502 4.502 0 0 0 13 4.644l-.168.16-.013.014-9.536 9.536a.75.75 0 0 1-1.133-.977l.072-.084 9.549-9.55h.002Z",
   "autocorrect-outline": "M13.461 4.934c.293.184.548.42.752.698l.117.171 2.945 4.696H21.5a.75.75 0 0 1 .743.649l.007.102a.75.75 0 0 1-.75.75l-3.284-.001.006.009-.009-.01a4.75 4.75 0 1 1-3.463-1.5h.756L13.059 6.6a1.25 1.25 0 0 0-2.04-.112l-.078.112-7.556 12.048a.75.75 0 0 1-1.322-.699l.052-.098L9.67 5.803a2.75 2.75 0 0 1 3.791-.869ZM14.751 12a3.25 3.25 0 1 0 0 6.5 3.25 3.25 0 0 0 0-6.5Z",
+  "automation-outline": [
+    "M21.78 3.28a.75.75 0 0 0-1.06-1.06l-2.012 2.012a4.251 4.251 0 0 0-5.463.462l-1.068 1.069a1.75 1.75 0 0 0 0 2.474l3.585 3.586a1.75 1.75 0 0 0 2.475 0l1.068-1.068a4.251 4.251 0 0 0 .463-5.463L21.78 3.28zm-3.585 2.475l.022.023l.003.002l.002.003l.023.022a2.75 2.75 0 0 1 0 3.89l-1.068 1.067a.25.25 0 0 1-.354 0l-3.586-3.585a.25.25 0 0 1 0-.354l1.068-1.068a2.75 2.75 0 0 1 3.89 0z",
+    "M10.78 11.28a.75.75 0 1 0-1.06-1.06L8 11.94l-.47-.47a.75.75 0 0 0-1.06 0l-1.775 1.775a4.251 4.251 0 0 0-.463 5.463L2.22 20.72a.75.75 0 1 0 1.06 1.06l2.012-2.012a4.251 4.251 0 0 0 5.463-.463l1.775-1.775a.75.75 0 0 0 0-1.06l-.47-.47l1.72-1.72a.75.75 0 1 0-1.06-1.06L11 14.94L9.06 13l1.72-1.72zm-3.314 2.247l.004.003l.003.004l2.993 2.993l.004.003l.003.004l.466.466l-1.244 1.245a2.75 2.75 0 0 1-3.89 0l-.05-.05a2.75 2.75 0 0 1 0-3.89L7 13.062l.466.466z"
+  ],
   "book-contacts-outline": "M15.5 12.25a.75.75 0 0 0-.75-.75h-5a.75.75 0 0 0-.75.75v.5c0 1 1.383 1.75 3.25 1.75s3.25-.75 3.25-1.75v-.5ZM14 8.745C14 7.78 13.217 7 12.25 7s-1.75.779-1.75 1.745a1.75 1.75 0 1 0 3.5 0ZM4 4.5A2.5 2.5 0 0 1 6.5 2H18a2.5 2.5 0 0 1 2.5 2.5v14.25a.75.75 0 0 1-.75.75H5.5a1 1 0 0 0 1 1h13.25a.75.75 0 0 1 0 1.5H6.5A2.5 2.5 0 0 1 4 19.5v-15Zm1.5 0V18H19V4.5a1 1 0 0 0-1-1H6.5a1 1 0 0 0-1 1Z",
-  "book-clock-outline": ["M13 9.125v1.625h.75a.625.625 0 1 1 0 1.25H12.5a.615.615 0 0 1-.063-.003.625.625 0 0 1-.688-.622v-2.25a.625.625 0 1 1 1.251 0Z", "M12.375 6.005a4.75 4.75 0 1 0 0 9.5 4.75 4.75 0 0 0 0-9.5Zm-3.5 4.75a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0Z", "M6.5 2A2.5 2.5 0 0 0 4 4.5v15A2.5 2.5 0 0 0 6.5 22h13.25a.75.75 0 0 0 0-1.5H6.5a1 1 0 0 1-1-1h14.25a.75.75 0 0 0 .75-.75V4.5A2.5 2.5 0 0 0 18 2H6.5ZM19 18H5.5V4.5a1 1 0 0 1 1-1H18a1 1 0 0 1 1 1V18Z"],
+  "book-clock-outline": [
+    "M13 9.125v1.625h.75a.625.625 0 1 1 0 1.25H12.5a.615.615 0 0 1-.063-.003.625.625 0 0 1-.688-.622v-2.25a.625.625 0 1 1 1.251 0Z",
+    "M12.375 6.005a4.75 4.75 0 1 0 0 9.5 4.75 4.75 0 0 0 0-9.5Zm-3.5 4.75a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0Z",
+    "M6.5 2A2.5 2.5 0 0 0 4 4.5v15A2.5 2.5 0 0 0 6.5 22h13.25a.75.75 0 0 0 0-1.5H6.5a1 1 0 0 1-1-1h14.25a.75.75 0 0 0 .75-.75V4.5A2.5 2.5 0 0 0 18 2H6.5ZM19 18H5.5V4.5a1 1 0 0 1 1-1H18a1 1 0 0 1 1 1V18Z"
+  ],
   "building-bank-outline": "M13.032 2.325a1.75 1.75 0 0 0-2.064 0L3.547 7.74c-.978.713-.473 2.26.736 2.26H4.5v5.8A2.75 2.75 0 0 0 3 18.25v1.5c0 .413.336.75.75.75h16.5a.75.75 0 0 0 .75-.75v-1.5a2.75 2.75 0 0 0-1.5-2.45V10h.217c1.21 0 1.713-1.547.736-2.26l-7.421-5.416Zm-1.18 1.211a.25.25 0 0 1 .295 0L18.95 8.5H5.05l6.803-4.964ZM18 10v5.5h-2V10h2Zm-3.5 0v5.5h-1.75V10h1.75Zm-3.25 0v5.5H9.5V10h1.75Zm-5.5 7h12.5c.69 0 1.25.56 1.25 1.25V19h-15v-.75c0-.69.56-1.25 1.25-1.25ZM6 15.5V10h2v5.5H6Z",
-  "calendar-clock-outline": ["M21 6.25A3.25 3.25 0 0 0 17.75 3H6.25A3.25 3.25 0 0 0 3 6.25v11.5A3.25 3.25 0 0 0 6.25 21h5.772a6.471 6.471 0 0 1-.709-1.5H6.25a1.75 1.75 0 0 1-1.75-1.75V8.5h15v2.813a6.471 6.471 0 0 1 1.5.709V6.25ZM6.25 4.5h11.5c.966 0 1.75.784 1.75 1.75V7h-15v-.75c0-.966.784-1.75 1.75-1.75Z", "M23 17.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0Zm-5.5 0h2a.5.5 0 0 1 0 1H17a.5.5 0 0 1-.5-.491v-3.01a.5.5 0 0 1 1 0V17.5Z"],
+  "calendar-clock-outline": [
+    "M21 6.25A3.25 3.25 0 0 0 17.75 3H6.25A3.25 3.25 0 0 0 3 6.25v11.5A3.25 3.25 0 0 0 6.25 21h5.772a6.471 6.471 0 0 1-.709-1.5H6.25a1.75 1.75 0 0 1-1.75-1.75V8.5h15v2.813a6.471 6.471 0 0 1 1.5.709V6.25ZM6.25 4.5h11.5c.966 0 1.75.784 1.75 1.75V7h-15v-.75c0-.966.784-1.75 1.75-1.75Z",
+    "M23 17.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0Zm-5.5 0h2a.5.5 0 0 1 0 1H17a.5.5 0 0 1-.5-.491v-3.01a.5.5 0 0 1 1 0V17.5Z"
+  ],
   "call-outline": "m7.056 2.418 1.167-.351a2.75 2.75 0 0 1 3.302 1.505l.902 2.006a2.75 2.75 0 0 1-.633 3.139L10.3 10.11a.25.25 0 0 0-.078.155c-.044.397.225 1.17.845 2.245.451.781.86 1.33 1.207 1.637.242.215.375.261.432.245l2.01-.615a2.75 2.75 0 0 1 3.034 1.02l1.281 1.776a2.75 2.75 0 0 1-.339 3.605l-.886.84a3.75 3.75 0 0 1-3.587.889c-2.754-.769-5.223-3.093-7.435-6.924-2.215-3.836-2.992-7.14-2.276-9.913a3.75 3.75 0 0 1 2.548-2.652Zm.433 1.437a2.25 2.25 0 0 0-1.529 1.59c-.602 2.332.087 5.261 2.123 8.788 2.033 3.522 4.222 5.582 6.54 6.23a2.25 2.25 0 0 0 2.151-.534l.887-.84a1.25 1.25 0 0 0 .154-1.639l-1.28-1.775a1.25 1.25 0 0 0-1.38-.464l-2.015.617c-1.17.348-2.232-.593-3.372-2.568C9 11.93 8.642 10.9 8.731 10.099c.047-.416.24-.8.546-1.086l1.494-1.393a1.25 1.25 0 0 0 .288-1.427l-.902-2.006a1.25 1.25 0 0 0-1.5-.684l-1.168.352Z",
   "chat-help-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a9.96 9.96 0 0 1-4.587-1.112l-3.826 1.067a1.25 1.25 0 0 1-1.54-1.54l1.068-3.823A9.96 9.96 0 0 1 2 12C2 6.477 6.477 2 12 2Zm0 1.5A8.5 8.5 0 0 0 3.5 12c0 1.47.373 2.883 1.073 4.137l.15.27-1.112 3.984 3.987-1.112.27.15A8.5 8.5 0 1 0 12 3.5Zm0 12a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm0-8.75a2.75 2.75 0 0 1 2.75 2.75c0 1.01-.297 1.574-1.051 2.359l-.169.171c-.622.622-.78.886-.78 1.47a.75.75 0 0 1-1.5 0c0-1.01.297-1.574 1.051-2.359l.169-.171c.622-.622.78-.886.78-1.47a1.25 1.25 0 0 0-2.493-.128l-.007.128a.75.75 0 0 1-1.5 0A2.75 2.75 0 0 1 12 6.75Z",
   "chat-multiple-outline": "M9.562 3a7.5 7.5 0 0 0-6.798 10.673l-.724 2.842a1.25 1.25 0 0 0 1.504 1.524c.75-.18 1.903-.457 2.93-.702A7.5 7.5 0 1 0 9.561 3Zm-6 7.5a6 6 0 1 1 3.33 5.375l-.244-.121-.264.063c-.923.22-1.99.475-2.788.667l.69-2.708.07-.276-.13-.253a5.971 5.971 0 0 1-.664-2.747Zm11 10.5c-1.97 0-3.762-.759-5.1-2h.1c.718 0 1.415-.089 2.08-.257.865.482 1.86.757 2.92.757.96 0 1.866-.225 2.67-.625l.243-.121.264.063c.922.22 1.966.445 2.74.61-.175-.751-.414-1.756-.642-2.651l-.07-.276.13-.253a5.971 5.971 0 0 0 .665-2.747 5.995 5.995 0 0 0-2.747-5.042 8.44 8.44 0 0 0-.8-2.047 7.503 7.503 0 0 1 4.344 10.263c.253 1.008.509 2.1.671 2.803a1.244 1.244 0 0 1-1.467 1.5 132.62 132.62 0 0 1-2.913-.64 7.476 7.476 0 0 1-3.088.663Z",
   "chat-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a9.96 9.96 0 0 1-4.587-1.112l-3.826 1.067a1.25 1.25 0 0 1-1.54-1.54l1.068-3.823A9.96 9.96 0 0 1 2 12C2 6.477 6.477 2 12 2Zm0 1.5A8.5 8.5 0 0 0 3.5 12c0 1.47.373 2.883 1.073 4.137l.15.27-1.112 3.984 3.987-1.112.27.15A8.5 8.5 0 1 0 12 3.5ZM8.75 13h4.498a.75.75 0 0 1 .102 1.493l-.102.007H8.75a.75.75 0 0 1-.102-1.493L8.75 13h4.498H8.75Zm0-3.5h6.505a.75.75 0 0 1 .101 1.493l-.101.007H8.75a.75.75 0 0 1-.102-1.493L8.75 9.5h6.505H8.75Z",
   "checkmark-circle-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 1.5a8.5 8.5 0 1 0 0 17 8.5 8.5 0 0 0 0-17Zm-1.25 9.94 4.47-4.47a.75.75 0 0 1 1.133.976l-.073.084-5 5a.75.75 0 0 1-.976.073l-.084-.073-2.5-2.5a.75.75 0 0 1 .976-1.133l.084.073 1.97 1.97 4.47-4.47-4.47 4.47Z",
   "checkmark-circle-solid": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm3.22 6.97-4.47 4.47-1.97-1.97a.75.75 0 0 0-1.06 1.06l2.5 2.5a.75.75 0 0 0 1.06 0l5-5a.75.75 0 1 0-1.06-1.06Z",
+  "checkmark-square-solid": "M18 3a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3h12zm-1.53 4.97L10 14.44l-2.47-2.47a.75.75 0 0 0-1.06 1.06l3 3a.75.75 0 0 0 1.06 0l7-7a.75.75 0 0 0-1.06-1.06z",
   "checkmark-outline": "M4.53 12.97a.75.75 0 0 0-1.06 1.06l4.5 4.5a.75.75 0 0 0 1.06 0l11-11a.75.75 0 0 0-1.06-1.06L8.5 16.94l-3.97-3.97Z",
   "chevron-down-outline": "M4.22 8.47a.75.75 0 0 1 1.06 0L12 15.19l6.72-6.72a.75.75 0 1 1 1.06 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L4.22 9.53a.75.75 0 0 1 0-1.06Z",
   "chevron-left-outline": "M15.53 4.22a.75.75 0 0 1 0 1.06L8.81 12l6.72 6.72a.75.75 0 1 1-1.06 1.06l-7.25-7.25a.75.75 0 0 1 0-1.06l7.25-7.25a.75.75 0 0 1 1.06 0Z",
@@ -34,6 +46,17 @@
   "cloud-outline": "M6.087 9.75a5.752 5.752 0 0 1 11.326 0h.087a4 4 0 0 1 0 8H6a4 4 0 0 1 0-8h.087ZM11.75 6.5a4.25 4.25 0 0 0-4.245 4.037.75.75 0 0 1-.749.713H6a2.5 2.5 0 0 0 0 5h11.5a2.5 2.5 0 0 0 0-5h-.756a.75.75 0 0 1-.75-.713A4.25 4.25 0 0 0 11.75 6.5Z",
   "code-outline": "m8.066 18.943 6.5-14.5a.75.75 0 0 1 1.404.518l-.036.096-6.5 14.5a.75.75 0 0 1-1.404-.518l.036-.096 6.5-14.5-6.5 14.5ZM2.22 11.47l4.25-4.25a.75.75 0 0 1 1.133.976l-.073.085L3.81 12l3.72 3.719a.75.75 0 0 1-.976 1.133l-.084-.073-4.25-4.25a.75.75 0 0 1-.073-.976l.073-.084 4.25-4.25-4.25 4.25Zm14.25-4.25a.75.75 0 0 1 .976-.073l.084.073 4.25 4.25a.75.75 0 0 1 .073.976l-.073.085-4.25 4.25a.75.75 0 0 1-1.133-.977l.073-.084L20.19 12l-3.72-3.72a.75.75 0 0 1 0-1.06Z",
   "contact-card-group-outline": "M18.75 4A3.25 3.25 0 0 1 22 7.25v9.505a3.25 3.25 0 0 1-3.25 3.25H5.25A3.25 3.25 0 0 1 2 16.755V7.25a3.25 3.25 0 0 1 3.066-3.245L5.25 4h13.5Zm0 1.5H5.25l-.144.006A1.75 1.75 0 0 0 3.5 7.25v9.505c0 .966.784 1.75 1.75 1.75h13.5a1.75 1.75 0 0 0 1.75-1.75V7.25a1.75 1.75 0 0 0-1.75-1.75Zm-9.497 7a.75.75 0 0 1 .75.75v.582c0 1.272-.969 1.918-2.502 1.918S5 15.104 5 13.831v-.581a.75.75 0 0 1 .75-.75h3.503Zm1.58-.001 1.417.001a.75.75 0 0 1 .75.75v.333c0 .963-.765 1.417-1.875 1.417-.116 0-.229-.005-.337-.015a2.85 2.85 0 0 0 .206-.9l.009-.253v-.582c0-.269-.061-.524-.17-.751Zm4.417.001h3a.75.75 0 0 1 .102 1.493L18.25 14h-3a.75.75 0 0 1-.102-1.493l.102-.007h3-3Zm-7.75-4a1.5 1.5 0 1 1 0 3.001 1.5 1.5 0 0 1 0-3.001Zm3.87.502a1.248 1.248 0 1 1 0 2.496 1.248 1.248 0 0 1 0-2.496Zm3.88.498h3a.75.75 0 0 1 .102 1.493L18.25 11h-3a.75.75 0 0 1-.102-1.493l.102-.007h3-3Z",
+  "copy-outline": [
+    "M8 3a1 1 0 0 0-1 1v.5a.5.5 0 0 1-1 0V4a2 2 0 0 1 2-2h.5a.5.5 0 0 1 0 1H8z",
+    "M7 12a1 1 0 0 0 1 1h.5a.5.5 0 0 1 0 1H8a2 2 0 0 1-2-2v-.5a.5.5 0 0 1 1 0v.5z",
+    "M7 6.5a.5.5 0 0 0-1 0v3a.5.5 0 0 0 1 0v-3z",
+    "M16 3a1 1 0 0 1 1 1v.5a.5.5 0 0 0 1 0V4a2 2 0 0 0-2-2h-.5a.5.5 0 0 0 0 1h.5z",
+    "M16 13a1 1 0 0 0 1-1v-.5a.5.5 0 0 1 1 0v.5a2 2 0 0 1-2 2h-.5a.5.5 0 0 1 0-1h.5z",
+    "M17.5 6a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 1 0v-3a.5.5 0 0 0-.5-.5z",
+    "M10.5 2a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3z",
+    "M10 13.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5z",
+    "M4 6h1v6.5A2.5 2.5 0 0 0 7.5 15H14v1a2 2 0 0 1-2 2H5.5A3.5 3.5 0 0 1 2 14.5V8a2 2 0 0 1 2-2z"
+  ],
   "delete-outline": "M12 1.75a3.25 3.25 0 0 1 3.245 3.066L15.25 5h5.25a.75.75 0 0 1 .102 1.493L20.5 6.5h-.796l-1.28 13.02a2.75 2.75 0 0 1-2.561 2.474l-.176.006H8.313a2.75 2.75 0 0 1-2.714-2.307l-.023-.174L4.295 6.5H3.5a.75.75 0 0 1-.743-.648L2.75 5.75a.75.75 0 0 1 .648-.743L3.5 5h5.25A3.25 3.25 0 0 1 12 1.75Zm6.197 4.75H5.802l1.267 12.872a1.25 1.25 0 0 0 1.117 1.122l.127.006h7.374c.6 0 1.109-.425 1.225-1.002l.02-.126L18.196 6.5ZM13.75 9.25a.75.75 0 0 1 .743.648L14.5 10v7a.75.75 0 0 1-1.493.102L13 17v-7a.75.75 0 0 1 .75-.75Zm-3.5 0a.75.75 0 0 1 .743.648L11 10v7a.75.75 0 0 1-1.493.102L9.5 17v-7a.75.75 0 0 1 .75-.75Zm1.75-6a1.75 1.75 0 0 0-1.744 1.606L10.25 5h3.5A1.75 1.75 0 0 0 12 3.25Z",
   "dismiss-circle-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 1.5a8.5 8.5 0 1 0 0 17 8.5 8.5 0 0 0 0-17Zm3.446 4.897.084.073a.75.75 0 0 1 .073.976l-.073.084L13.061 12l2.47 2.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-2.47 2.47a.75.75 0 0 1-.976.072l-.084-.073a.75.75 0 0 1-.073-.976l.073-.084L10.939 12l-2.47-2.47a.75.75 0 0 1-.072-.976l.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l2.47-2.47a.75.75 0 0 1 .976-.072Z",
   "dismiss-outline": "m4.397 4.554.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l6.47-6.47a.75.75 0 1 1 1.06 1.061L13.061 12l6.47 6.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-6.47 6.47a.75.75 0 0 1-1.06-1.061L10.939 12l-6.47-6.47a.75.75 0 0 1-.072-.976l.073-.084-.073.084Z",
@@ -80,6 +103,7 @@
   "sound-source-outline": "M3.5 12a8.5 8.5 0 1 1 14.762 5.748l.992 1.135A9.966 9.966 0 0 0 22 12c0-5.523-4.477-10-10-10S2 6.477 2 12a9.966 9.966 0 0 0 2.746 6.883l.993-1.134A8.47 8.47 0 0 1 3.5 12Z M19.25 12.125a7.098 7.098 0 0 1-1.783 4.715l-.998-1.14a5.625 5.625 0 1 0-8.806-.15l-1.004 1.146a7.125 7.125 0 1 1 12.59-4.571Z M16.25 12a4.23 4.23 0 0 1-.821 2.511l-1.026-1.172a2.75 2.75 0 1 0-4.806 0L8.571 14.51A4.25 4.25 0 1 1 16.25 12Z M12.564 12.756a.75.75 0 0 0-1.128 0l-7 8A.75.75 0 0 0 5 22h14a.75.75 0 0 0 .564-1.244l-7-8Zm4.783 7.744H6.653L12 14.389l5.347 6.111Z",
   "speaker-1-outline": "M14.704 3.442c.191.226.296.512.296.808v15.502a1.25 1.25 0 0 1-2.058.954L7.975 16.5H4.25A2.25 2.25 0 0 1 2 14.25v-4.5A2.25 2.25 0 0 1 4.25 7.5h3.725l4.968-4.204a1.25 1.25 0 0 1 1.761.147ZM13.5 4.79 8.525 9H4.25a.75.75 0 0 0-.75.75v4.5c0 .415.336.75.75.75h4.275l4.975 4.213V4.79Zm3.604 3.851a.75.75 0 0 1 1.03.25c.574.94.862 1.992.862 3.14 0 1.149-.288 2.201-.862 3.141a.75.75 0 1 1-1.28-.781c.428-.702.642-1.483.642-2.36 0-.876-.214-1.657-.642-2.359a.75.75 0 0 1 .25-1.03Z",
   "speaker-mute-outline": "M12.92 3.316c.806-.717 2.08-.145 2.08.934v15.496c0 1.078-1.274 1.65-2.08.934l-4.492-3.994a.75.75 0 0 0-.498-.19H4.25A2.25 2.25 0 0 1 2 14.247V9.75a2.25 2.25 0 0 1 2.25-2.25h3.68a.75.75 0 0 0 .498-.19l4.491-3.993Zm.58 1.49L9.425 8.43A2.25 2.25 0 0 1 7.93 9H4.25a.75.75 0 0 0-.75.75v4.497c0 .415.336.75.75.75h3.68a2.25 2.25 0 0 1 1.495.57l4.075 3.623V4.807ZM16.22 9.22a.75.75 0 0 1 1.06 0L19 10.94l1.72-1.72a.75.75 0 1 1 1.06 1.06L20.06 12l1.72 1.72a.75.75 0 1 1-1.06 1.06L19 13.06l-1.72 1.72a.75.75 0 1 1-1.06-1.06L17.94 12l-1.72-1.72a.75.75 0 0 1 0-1.06Z",
+  "square-outline": "M3 6a3 3 0 0 1 3-3h8a3 3 0 0 1 3 3v8a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6zm3-2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H6z",
   "star-emphasis-outline": "M13.209 3.103c-.495-1.004-1.926-1.004-2.421 0L8.43 7.88l-5.273.766c-1.107.161-1.55 1.522-.748 2.303l3.815 3.72-.9 5.25c-.19 1.103.968 1.944 1.959 1.424l4.715-2.48 4.716 2.48c.99.52 2.148-.32 1.96-1.424l-.902-5.25 3.816-3.72c.8-.78.359-2.142-.748-2.303l-5.273-.766-2.358-4.777ZM9.74 8.615l2.258-4.576 2.259 4.576a1.35 1.35 0 0 0 1.016.738l5.05.734-3.654 3.562a1.35 1.35 0 0 0-.388 1.195l.862 5.03-4.516-2.375a1.35 1.35 0 0 0-1.257 0l-4.516 2.374.862-5.029a1.35 1.35 0 0 0-.388-1.195l-3.654-3.562 5.05-.734c.44-.063.82-.34 1.016-.738ZM1.164 3.782a.75.75 0 0 0 .118 1.054l2.5 2a.75.75 0 1 0 .937-1.172l-2.5-2a.75.75 0 0 0-1.055.118Z M22.836 18.218a.75.75 0 0 0-.117-1.054l-2.5-2a.75.75 0 0 0-.938 1.172l2.5 2a.75.75 0 0 0 1.055-.117ZM1.282 17.164a.75.75 0 1 0 .937 1.172l2.5-2a.75.75 0 0 0-.937-1.172l-2.5 2ZM22.836 3.782a.75.75 0 0 1-.117 1.054l-2.5 2a.75.75 0 0 1-.938-1.172l2.5-2a.75.75 0 0 1 1.055.118Z",
   "subtract-outline": "M3.997 13H20a1 1 0 1 0 0-2H3.997a1 1 0 1 0 0 2Z",
   "tag-outline": "M19.75 2A2.25 2.25 0 0 1 22 4.25v5.462a3.25 3.25 0 0 1-.952 2.298l-8.5 8.503a3.255 3.255 0 0 1-4.597.001L3.489 16.06a3.25 3.25 0 0 1-.003-4.596l8.5-8.51A3.25 3.25 0 0 1 14.284 2h5.465Zm0 1.5h-5.465c-.465 0-.91.185-1.239.513l-8.512 8.523a1.75 1.75 0 0 0 .015 2.462l4.461 4.454a1.755 1.755 0 0 0 2.477 0l8.5-8.503a1.75 1.75 0 0 0 .513-1.237V4.25a.75.75 0 0 0-.75-.75ZM17 5.502a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Z",
@@ -87,7 +111,6 @@
   "video-outline": "M13.75 4.5A3.25 3.25 0 0 1 17 7.75v.173l3.864-2.318A.75.75 0 0 1 22 6.248V17.75a.75.75 0 0 1-1.136.643L17 16.075v.175a3.25 3.25 0 0 1-3.25 3.25h-8.5A3.25 3.25 0 0 1 2 16.25v-8.5A3.25 3.25 0 0 1 5.25 4.5h8.5Zm0 1.5h-8.5A1.75 1.75 0 0 0 3.5 7.75v8.5c0 .966.784 1.75 1.75 1.75h8.5a1.75 1.75 0 0 0 1.75-1.75v-8.5A1.75 1.75 0 0 0 13.75 6Zm6.75 1.573L17 9.674v4.651l3.5 2.1V7.573Z",
   "warning-outline": "M10.91 2.782a2.25 2.25 0 0 1 2.975.74l.083.138 7.759 14.009a2.25 2.25 0 0 1-1.814 3.334l-.154.006H4.243a2.25 2.25 0 0 1-2.041-3.197l.072-.143L10.031 3.66a2.25 2.25 0 0 1 .878-.878Zm9.505 15.613-7.76-14.008a.75.75 0 0 0-1.254-.088l-.057.088-7.757 14.008a.75.75 0 0 0 .561 1.108l.095.006h15.516a.75.75 0 0 0 .696-1.028l-.04-.086-7.76-14.008 7.76 14.008ZM12 16.002a.999.999 0 1 1 0 1.997.999.999 0 0 1 0-1.997ZM11.995 8.5a.75.75 0 0 1 .744.647l.007.102.004 4.502a.75.75 0 0 1-1.494.103l-.006-.102-.004-4.502a.75.75 0 0 1 .75-.75Z",
   "wifi-off-outline": "m12.858 14.273 7.434 7.434a1 1 0 0 0 1.414-1.414l-17.999-18a1 1 0 1 0-1.414 1.414L5.39 6.804c-.643.429-1.254.927-1.821 1.495a12.382 12.382 0 0 0-1.39 1.683 1 1 0 0 0 1.644 1.14c.363-.524.761-1.01 1.16-1.41a9.94 9.94 0 0 1 1.855-1.46L7.99 9.405a8.14 8.14 0 0 0-3.203 3.377 1 1 0 0 0 1.784.903 6.08 6.08 0 0 1 1.133-1.563 6.116 6.116 0 0 1 1.77-1.234l1.407 1.407A5.208 5.208 0 0 0 8.336 13.7a5.25 5.25 0 0 0-1.09 1.612 1 1 0 0 0 1.832.802c.167-.381.394-.722.672-1a3.23 3.23 0 0 1 3.108-.841Zm-1.332-5.93 2.228 2.229a6.1 6.1 0 0 1 2.616 1.55c.444.444.837.995 1.137 1.582a1 1 0 1 0 1.78-.911 8.353 8.353 0 0 0-1.503-2.085 8.108 8.108 0 0 0-6.258-2.365ZM8.51 5.327l1.651 1.651a9.904 9.904 0 0 1 10.016 4.148 1 1 0 1 0 1.646-1.136A11.912 11.912 0 0 0 8.51 5.327Zm4.552 11.114a1.501 1.501 0 1 1-2.123 2.123 1.501 1.501 0 0 1 2.123-2.123Z",
-
   "brand-facebook-outline": "M24 12.073c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.99 4.388 10.954 10.125 11.854v-8.385H7.078v-3.47h3.047V9.43c0-3.007 1.792-4.669 4.533-4.669 1.312 0 2.686.235 2.686.235v2.953H15.83c-1.491 0-1.956.925-1.956 1.874v2.25h3.328l-.532 3.47h-2.796v8.385C19.612 23.027 24 18.062 24 12.073z",
   "brand-line-outline": "M19.365 9.863c.349 0 .63.285.63.631 0 .345-.281.63-.63.63H17.61v1.125h1.755c.349 0 .63.283.63.63 0 .344-.281.629-.63.629h-2.386c-.345 0-.627-.285-.627-.629V8.108c0-.345.282-.63.63-.63h2.386c.346 0 .627.285.627.63 0 .349-.281.63-.63.63H17.61v1.125h1.755zm-3.855 3.016c0 .27-.174.51-.432.596-.064.021-.133.031-.199.031-.211 0-.391-.09-.51-.25l-2.443-3.317v2.94c0 .344-.279.629-.631.629-.346 0-.626-.285-.626-.629V8.108c0-.27.173-.51.43-.595.06-.023.136-.033.194-.033.195 0 .375.104.495.254l2.462 3.33V8.108c0-.345.282-.63.63-.63.345 0 .63.285.63.63v4.771zm-5.741 0c0 .344-.282.629-.631.629-.345 0-.627-.285-.627-.629V8.108c0-.345.282-.63.63-.63.346 0 .628.285.628.63v4.771zm-2.466.629H4.917c-.345 0-.63-.285-.63-.629V8.108c0-.345.285-.63.63-.63.348 0 .63.285.63.63v4.141h1.756c.348 0 .629.283.629.63 0 .344-.282.629-.629.629M24 10.314C24 4.943 18.615.572 12 .572S0 4.943 0 10.314c0 4.811 4.27 8.842 10.035 9.608.391.082.923.258 1.058.59.12.301.079.766.038 1.08l-.164 1.02c-.045.301-.24 1.186 1.049.645 1.291-.539 6.916-4.078 9.436-6.975C23.176 14.393 24 12.458 24 10.314",
   "brand-linkedin-outline": "M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z",
@@ -95,7 +118,6 @@
   "brand-telegram-outline": "M11.944 0A12 12 0 0 0 0 12a12 12 0 0 0 12 12 12 12 0 0 0 12-12A12 12 0 0 0 12 0a12 12 0 0 0-.056 0zm4.962 7.224c.1-.002.321.023.465.14a.506.506 0 0 1 .171.325c.016.093.036.306.02.472-.18 1.898-.962 6.502-1.36 8.627-.168.9-.499 1.201-.82 1.23-.696.065-1.225-.46-1.9-.902-1.056-.693-1.653-1.124-2.678-1.8-1.185-.78-.417-1.21.258-1.91.177-.184 3.247-2.977 3.307-3.23.007-.032.014-.15-.056-.212s-.174-.041-.249-.024c-.106.024-1.793 1.14-5.061 3.345-.48.33-.913.49-1.302.48-.428-.008-1.252-.241-1.865-.44-.752-.245-1.349-.374-1.297-.789.027-.216.325-.437.893-.663 3.498-1.524 5.83-2.529 6.998-3.014 3.332-1.386 4.025-1.627 4.476-1.635z",
   "brand-twitter-outline": "M23.953 4.57a10 10 0 01-2.825.775 4.958 4.958 0 002.163-2.723c-.951.555-2.005.959-3.127 1.184a4.92 4.92 0 00-8.384 4.482C7.69 8.095 4.067 6.13 1.64 3.162a4.822 4.822 0 00-.666 2.475c0 1.71.87 3.213 2.188 4.096a4.904 4.904 0 01-2.228-.616v.06a4.923 4.923 0 003.946 4.827 4.996 4.996 0 01-2.212.085 4.936 4.936 0 004.604 3.417 9.867 9.867 0 01-6.102 2.105c-.39 0-.779-.023-1.17-.067a13.995 13.995 0 007.557 2.209c9.053 0 13.998-7.496 13.998-13.985 0-.21 0-.42-.015-.63A9.935 9.935 0 0024 4.59z",
   "brand-whatsapp-outline": "M17.472 14.382c-.297-.149-1.758-.867-2.03-.967-.273-.099-.471-.148-.67.15-.197.297-.767.966-.94 1.164-.173.199-.347.223-.644.075-.297-.15-1.255-.463-2.39-1.475-.883-.788-1.48-1.761-1.653-2.059-.173-.297-.018-.458.13-.606.134-.133.298-.347.446-.52.149-.174.198-.298.298-.497.099-.198.05-.371-.025-.52-.075-.149-.669-1.612-.916-2.207-.242-.579-.487-.5-.669-.51-.173-.008-.371-.01-.57-.01-.198 0-.52.074-.792.372-.272.297-1.04 1.016-1.04 2.479 0 1.462 1.065 2.875 1.213 3.074.149.198 2.096 3.2 5.077 4.487.709.306 1.262.489 1.694.625.712.227 1.36.195 1.871.118.571-.085 1.758-.719 2.006-1.413.248-.694.248-1.289.173-1.413-.074-.124-.272-.198-.57-.347m-5.421 7.403h-.004a9.87 9.87 0 01-5.031-1.378l-.361-.214-3.741.982.998-3.648-.235-.374a9.86 9.86 0 01-1.51-5.26c.001-5.45 4.436-9.884 9.888-9.884 2.64 0 5.122 1.03 6.988 2.898a9.825 9.825 0 012.893 6.994c-.003 5.45-4.437 9.884-9.885 9.884m8.413-18.297A11.815 11.815 0 0012.05 0C5.495 0 .16 5.335.157 11.892c0 2.096.547 4.142 1.588 5.945L.057 24l6.305-1.654a11.882 11.882 0 005.683 1.448h.005c6.554 0 11.89-5.335 11.893-11.893a11.821 11.821 0 00-3.48-8.413Z",
-
   "add-solid": "M11.883 3.007 12 3a1 1 0 0 1 .993.883L13 4v7h7a1 1 0 0 1 .993.883L21 12a1 1 0 0 1-.883.993L20 13h-7v7a1 1 0 0 1-.883.993L12 21a1 1 0 0 1-.993-.883L11 20v-7H4a1 1 0 0 1-.993-.883L3 12a1 1 0 0 1 .883-.993L4 11h7V4a1 1 0 0 1 .883-.993L12 3l-.117.007Z",
   "subtract-solid": "M3.997 13H20a1 1 0 1 0 0-2H3.997a1 1 0 1 0 0 2Z"
 }
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index cfd97e560..5b4893763 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -14,7 +14,7 @@ class AutomationRuleListener < BaseListener
     return unless rule_present?('conversation_created', conversation)
 
     @rules.each do |rule|
-      conditions_match = ::AutomationRule::ConditionsFilterService.new(rule, conversation).perform
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation).perform
       ::AutomationRules::ActionService.new(rule, conversation).perform if conditions_match.present?
     end
   end

From 193a531e4998b2cf0deafb7466109b094e000caf Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Wed, 2 Feb 2022 19:15:02 +0530
Subject: [PATCH 048/101] feat: Edit automation modal (#3876)

* Add automation modal

* Fix the v-model for automations

* Actions and Condition dropdowns for automations

* Fix merge conflicts

* Handle event change and confirmation

* Appends new action

* Removes actions

* Automation api integration

* Api integration for creating automations

* Registers vuex module to the global store

* Automations table

* Updarted labels and actions

* Integrate automation api

* Fixes the mutation error - removed the data key wrapper

* Fixed the automation condition models to work with respective event types

* Remove temporary fixes added to the api request

* Displa timestamp and automation status values

* Added the clone buton

* Removed uncessary helper method

* Specs for automations

* Handle WIP code

* Remove the payload wrap

* Fix the action query payload

* Removed unnecessary files

* Disabled Automations routes

* Ability to delete automations

* Fix specs

* Edit automation modal

* Edit automation modal and api integration

* Replaced hardcoded values

* Using absolute paths

* Update app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>

* Update app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>

* Intendation fix

* Disable automation route

* Minor fix

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../layout/config/sidebarItems/settings.js    |  14 +-
 .../settings/automation/AddAutomationRule.vue |   6 +-
 .../automation/EditAutomationRule.vue         | 479 ++++++++++++++++++
 .../dashboard/settings/automation/Index.vue   |  43 +-
 .../dashboard/store/modules/automations.js    |   3 +-
 5 files changed, 526 insertions(+), 19 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue

diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 176fd152c..577d41c6b 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -69,13 +69,13 @@ const settings = accountId => ({
       ),
       toStateName: 'attributes_list',
     },
-    {
-      icon: 'automation',
-      label: 'AUTOMATION',
-      hasSubMenu: false,
-      toState: frontendURL(`accounts/${accountId}/settings/automation/list`),
-      toStateName: 'automation_list',
-    },
+    // {
+    //   icon: 'automation',
+    //   label: 'AUTOMATION',
+    //   hasSubMenu: false,
+    //   toState: frontendURL(`accounts/${accountId}/settings/automation/list`),
+    //   toStateName: 'automation_list',
+    // },
     {
       icon: 'chat-multiple',
       label: 'CANNED_RESPONSES',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
index d26a5695b..3f9d2d83e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -434,13 +434,13 @@ export default {
 }
 .event_wrapper {
   select {
-    margin: 0;
+    margin: var(--space-zero);
   }
   .info-message {
     font-size: var(--font-size-mini);
-    color: #868686;
+    color: var(--s-500);
     text-align: right;
   }
-  margin-bottom: 1.6rem;
+  margin-bottom: var(--space-medium);
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
new file mode 100644
index 000000000..223c9577f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -0,0 +1,479 @@
+<template>
+  <div class="column">
+    <woot-modal-header :header-title="$t('AUTOMATION.EDIT.TITLE')" />
+    <div class="row modal-content">
+      <div class="medium-12 columns">
+        <woot-input
+          v-model="automation.name"
+          :label="$t('AUTOMATION.ADD.FORM.NAME.LABEL')"
+          type="text"
+          :class="{ error: $v.automation.name.$error }"
+          :error="
+            $v.automation.name.$error
+              ? $t('AUTOMATION.ADD.FORM.NAME.ERROR')
+              : ''
+          "
+          :placeholder="$t('AUTOMATION.ADD.FORM.NAME.PLACEHOLDER')"
+          @blur="$v.automation.name.$touch"
+        />
+        <woot-input
+          v-model="automation.description"
+          :label="$t('AUTOMATION.ADD.FORM.DESC.LABEL')"
+          type="text"
+          :class="{ error: $v.automation.description.$error }"
+          :error="
+            $v.automation.description.$error
+              ? $t('AUTOMATION.ADD.FORM.DESC.ERROR')
+              : ''
+          "
+          :placeholder="$t('AUTOMATION.ADD.FORM.DESC.PLACEHOLDER')"
+          @blur="$v.automation.description.$touch"
+        />
+        <div class="event_wrapper">
+          <label :class="{ error: $v.automation.event_name.$error }">
+            {{ $t('AUTOMATION.ADD.FORM.EVENT.LABEL') }}
+            <select v-model="automation.event_name" @change="onEventChange()">
+              <option
+                v-for="event in automationRuleEvents"
+                :key="event.key"
+                :value="event.key"
+              >
+                {{ event.value }}
+              </option>
+            </select>
+            <span v-if="$v.automation.event_name.$error" class="message">
+              {{ $t('AUTOMATION.ADD.FORM.EVENT.ERROR') }}
+            </span>
+          </label>
+        </div>
+        <!-- // Conditions Start -->
+        <section>
+          <label>
+            {{ $t('AUTOMATION.ADD.FORM.CONDITIONS.LABEL') }}
+          </label>
+          <div class="medium-12 columns filters-wrap">
+            <filter-input-box
+              v-for="(condition, i) in automation.conditions"
+              :key="i"
+              v-model="automation.conditions[i]"
+              :filter-attributes="getAttributes(automation.event_name)"
+              :input-type="getInputType(automation.conditions[i].attribute_key)"
+              :operators="getOperators(automation.conditions[i].attribute_key)"
+              :dropdown-values="
+                getConditionDropdownValues(
+                  automation.conditions[i].attribute_key
+                )
+              "
+              :show-query-operator="i !== automation.conditions.length - 1"
+              :v="$v.automation.conditions.$each[i]"
+              @resetFilter="resetFilter(i, automation.conditions[i])"
+              @removeFilter="removeFilter(i)"
+            />
+            <div class="filter-actions">
+              <woot-button
+                icon="add"
+                color-scheme="success"
+                variant="smooth"
+                size="small"
+                @click="appendNewCondition"
+              >
+                {{ $t('AUTOMATION.ADD.CONDITION_BUTTON_LABEL') }}
+              </woot-button>
+            </div>
+          </div>
+        </section>
+        <!-- // Conditions End -->
+        <!-- // Actions Start -->
+        <section>
+          <label>
+            {{ $t('AUTOMATION.ADD.FORM.ACTIONS.LABEL') }}
+          </label>
+          <div class="medium-12 columns filters-wrap">
+            <automation-action-input
+              v-for="(action, i) in automation.actions"
+              :key="i"
+              v-model="automation.actions[i]"
+              :action-types="automationActionTypes"
+              :dropdown-values="
+                getActionDropdownValues(automation.actions[i].action_name)
+              "
+              :v="$v.automation.actions.$each[i]"
+              @removeAction="removeAction(i)"
+            />
+            <div class="filter-actions">
+              <woot-button
+                icon="add"
+                color-scheme="success"
+                variant="smooth"
+                size="small"
+                @click="appendNewAction"
+              >
+                {{ $t('AUTOMATION.ADD.ACTION_BUTTON_LABEL') }}
+              </woot-button>
+            </div>
+          </div>
+        </section>
+        <!-- // Actions End -->
+        <div class="medium-12 columns">
+          <div class="modal-footer justify-content-end w-full">
+            <woot-button
+              class="button"
+              variant="clear"
+              @click.prevent="onClose"
+            >
+              {{ $t('AUTOMATION.ADD.CANCEL_BUTTON_TEXT') }}
+            </woot-button>
+            <woot-button @click="submitAutomation">
+              {{ $t('AUTOMATION.ADD.SUBMIT') }}
+            </woot-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import alertMixin from 'shared/mixins/alertMixin';
+import { required, requiredIf } from 'vuelidate/lib/validators';
+import filterInputBox from 'dashboard/components/widgets/FilterInput/Index.vue';
+import automationActionInput from 'dashboard/components/widgets/AutomationActionInput.vue';
+import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
+import countries from 'shared/constants/countries.js';
+import {
+  AUTOMATION_RULE_EVENTS,
+  AUTOMATION_ACTION_TYPES,
+  AUTOMATIONS,
+} from './constants';
+import filterQueryGenerator from 'dashboard/helper/filterQueryGenerator.js';
+import actionQueryGenerator from 'dashboard/helper/actionQueryGenerator.js';
+
+export default {
+  components: {
+    filterInputBox,
+    automationActionInput,
+  },
+  mixins: [alertMixin],
+  props: {
+    onClose: {
+      type: Function,
+      default: () => {},
+    },
+    selectedResponse: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  validations: {
+    automation: {
+      name: {
+        required,
+      },
+      description: {
+        required,
+      },
+      event_name: {
+        required,
+      },
+      conditions: {
+        required,
+        $each: {
+          values: {
+            required: requiredIf(prop => {
+              return !(
+                prop.filter_operator === 'is_present' ||
+                prop.filter_operator === 'is_not_present'
+              );
+            }),
+          },
+        },
+      },
+      actions: {
+        required,
+        $each: {
+          action_params: {
+            required,
+          },
+        },
+      },
+    },
+  },
+  data() {
+    return {
+      automationTypes: AUTOMATIONS,
+      automationRuleEvent: AUTOMATION_RULE_EVENTS[0].key,
+      automationRuleEvents: AUTOMATION_RULE_EVENTS,
+      automationActionTypes: AUTOMATION_ACTION_TYPES,
+      automationMutated: false,
+      show: true,
+      automation: {
+        name: null,
+        description: null,
+        event_name: 'conversation_created',
+        conditions: [
+          {
+            attribute_key: 'status',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          },
+        ],
+        actions: [
+          {
+            action_name: 'assign_team',
+            action_params: [],
+          },
+        ],
+      },
+      showDeleteConfirmationModal: false,
+    };
+  },
+  computed: {
+    conditions() {
+      return this.automationTypes[this.automation.event_name].conditions;
+    },
+    actions() {
+      return this.automationTypes[this.automation.event_name].actions;
+    },
+    filterAttributes() {
+      return this.filterTypes.map(type => {
+        return {
+          key: type.attributeKey,
+          name: type.attributeName,
+          attributeI18nKey: type.attributeI18nKey,
+        };
+      });
+    },
+  },
+  mounted() {
+    this.formatConditions(this.selectedResponse);
+  },
+  methods: {
+    onEventChange() {
+      if (this.automation.event_name === 'message_created') {
+        this.automation.conditions = [
+          {
+            attribute_key: 'message_type',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          },
+        ];
+      } else {
+        this.automation.conditions = [
+          {
+            attribute_key: 'status',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          },
+        ];
+      }
+      this.automation.actions = [
+        {
+          action_name: 'assign_team',
+          action_params: [],
+        },
+      ];
+    },
+    getAttributes(key) {
+      return this.automationTypes[key].conditions;
+    },
+    getInputType(key) {
+      const type = this.automationTypes[
+        this.automation.event_name
+      ].conditions.find(condition => condition.key === key);
+      return type.inputType;
+    },
+    getOperators(key) {
+      const type = this.automationTypes[
+        this.automation.event_name
+      ].conditions.find(condition => condition.key === key);
+      return type.filterOperators;
+    },
+    getConditionDropdownValues(type) {
+      const statusFilters = this.$t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS');
+      switch (type) {
+        case 'status':
+          return [
+            ...Object.keys(statusFilters).map(status => {
+              return {
+                id: status,
+                name: statusFilters[status].TEXT,
+              };
+            }),
+            {
+              id: 'all',
+              name: this.$t('CHAT_LIST.FILTER_ALL'),
+            },
+          ];
+        case 'assignee_id':
+          return this.$store.getters['agents/getAgents'];
+        case 'contact':
+          return this.$store.getters['contacts/getContacts'];
+        case 'inbox_id':
+          return this.$store.getters['inboxes/getInboxes'];
+        case 'team_id':
+          return this.$store.getters['teams/getTeams'];
+        case 'campaign_id':
+          return this.$store.getters['campaigns/getAllCampaigns'].map(i => {
+            return {
+              id: i.id,
+              name: i.title,
+            };
+          });
+        case 'labels':
+          return this.$store.getters['labels/getLabels'].map(i => {
+            return {
+              id: i.id,
+              name: i.title,
+            };
+          });
+        case 'browser_language':
+          return languages;
+        case 'country_code':
+          return countries;
+        case 'message_type':
+          return [
+            {
+              id: 'incoming',
+              name: 'Incoming Message',
+            },
+            {
+              id: 'outgoing',
+              name: 'Outgoing Message',
+            },
+          ];
+        default:
+          return undefined;
+      }
+    },
+    getActionDropdownValues(type) {
+      switch (type) {
+        case 'assign_team':
+        case 'send_message':
+          return this.$store.getters['teams/getTeams'];
+        case 'add_label':
+          return this.$store.getters['labels/getLabels'].map(i => {
+            return {
+              id: i.title,
+              name: i.title,
+            };
+          });
+        default:
+          return undefined;
+      }
+    },
+    appendNewCondition() {
+      this.automation.conditions.push({
+        attribute_key: 'status',
+        filter_operator: 'equal_to',
+        values: '',
+        query_operator: 'and',
+      });
+    },
+    appendNewAction() {
+      this.automation.actions.push({
+        action_name: 'assign_team',
+        action_params: [],
+      });
+    },
+    removeFilter(index) {
+      if (this.automation.conditions.length <= 1) {
+        this.showAlert(this.$t('FILTER.FILTER_DELETE_ERROR'));
+      } else {
+        this.automation.conditions.splice(index, 1);
+      }
+    },
+    removeAction(index) {
+      if (this.automation.actions.length <= 1) {
+        this.showAlert(this.$t('FILTER.FILTER_DELETE_ERROR'));
+      } else {
+        this.automation.actions.splice(index, 1);
+      }
+    },
+    submitAutomation() {
+      this.$v.$touch();
+      if (this.$v.$invalid) return;
+      this.automation.conditions[
+        this.automation.conditions.length - 1
+      ].query_operator = null;
+      this.automation.conditions = filterQueryGenerator(
+        this.automation.conditions
+      ).payload;
+      this.automation.actions = actionQueryGenerator(this.automation.actions);
+      this.$emit('saveAutomation', this.automation, 'EDIT');
+    },
+    resetFilter(index, currentCondition) {
+      this.automation.conditions[index].filter_operator = this.automationTypes[
+        this.automation.event_name
+      ].conditions.find(
+        condition => condition.key === currentCondition.attribute_key
+      ).filterOperators[0].value;
+      this.automation.conditions[index].values = '';
+    },
+    showUserInput(operatorType) {
+      if (operatorType === 'is_present' || operatorType === 'is_not_present')
+        return false;
+      return true;
+    },
+    formatConditions(automation) {
+      const formattedConditions = automation.conditions.map(condition => {
+        const inputType = this.automationTypes[
+          automation.event_name
+        ].conditions.find(item => item.key === condition.attribute_key)
+          .inputType;
+        if (inputType === 'plain_text') {
+          return {
+            ...condition,
+            values: condition.values[0],
+          };
+        }
+        return {
+          ...condition,
+          values: [
+            ...this.getConditionDropdownValues(condition.attribute_key),
+          ].filter(item => [...condition.values].includes(item.id)),
+        };
+      });
+      const formattedActions = automation.actions.map(action => {
+        return {
+          ...action,
+          action_params: [
+            ...this.getActionDropdownValues(action.action_name),
+          ].filter(item => [...action.action_params].includes(item.id)),
+        };
+      });
+      this.automation = {
+        ...automation,
+        conditions: formattedConditions,
+        actions: formattedActions,
+      };
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.filters-wrap {
+  padding: var(--space-normal);
+  border-radius: var(--border-radius-large);
+  border: 1px solid var(--color-border);
+  background: var(--color-background-light);
+  margin-bottom: var(--space-normal);
+}
+
+.filter-actions {
+  margin-top: var(--space-normal);
+}
+.event_wrapper {
+  select {
+    margin: var(--space-zero);
+  }
+  .info-message {
+    font-size: var(--font-size-mini);
+    color: var(--s-500);
+    text-align: right;
+  }
+  margin-bottom: var(--space-medium);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 39c83c5fe..6c1892a28 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -43,7 +43,7 @@
               </td>
               <td>{{ readableTime(automation.created_on) }}</td>
               <td class="button-wrapper">
-                <!-- <woot-button
+                <woot-button
                   v-tooltip.top="$t('AUTOMATION.FORM.EDIT')"
                   variant="smooth"
                   size="tiny"
@@ -54,7 +54,7 @@
                   @click="openEditPopup(automation)"
                 >
                 </woot-button>
-                <woot-button
+                <!-- <woot-button
                   v-tooltip.top="'Clone'"
                   variant="smooth"
                   size="tiny"
@@ -94,7 +94,7 @@
       <add-automation-rule
         v-if="showAddPopup"
         :on-close="hideAddPopup"
-        @saveAutomation="onCreateAutomation"
+        @saveAutomation="submitAutomation"
       />
     </woot-modal>
 
@@ -107,17 +107,32 @@
       :confirm-text="deleteConfirmText"
       :reject-text="deleteRejectText"
     />
+
+    <woot-modal
+      :show.sync="showEditPopup"
+      size="medium"
+      :on-close="hideEditPopup"
+    >
+      <edit-automation-rule
+        v-if="showEditPopup"
+        :on-close="hideEditPopup"
+        :selected-response="selectedResponse"
+        @saveAutomation="submitAutomation"
+      />
+    </woot-modal>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import AddAutomationRule from './AddAutomationRule.vue';
+import EditAutomationRule from './EditAutomationRule.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import timeMixin from 'dashboard/mixins/time';
 
 export default {
   components: {
     AddAutomationRule,
+    EditAutomationRule,
   },
   mixins: [alertMixin, timeMixin],
   data() {
@@ -162,8 +177,8 @@ export default {
       this.showAddPopup = false;
     },
     openEditPopup(response) {
-      this.showEditPopup = true;
       this.selectedResponse = response;
+      this.showEditPopup = true;
     },
     hideEditPopup() {
       this.showEditPopup = false;
@@ -189,13 +204,25 @@ export default {
         this.showAlert(this.$t('AUTOMATION.DELETE.API.ERROR_MESSAGE'));
       }
     },
-    async onCreateAutomation(payload) {
+    async submitAutomation(payload, mode) {
       try {
-        await await this.$store.dispatch('automations/create', payload);
-        this.showAlert(this.$t('AUTOMATION.ADD.API.SUCCESS_MESSAGE'));
+        const action =
+          mode === 'EDIT' ? 'automations/update' : 'automations/create';
+        const successMessage =
+          mode === 'edit'
+            ? this.$t('AUTOMATION.EDIT.API.SUCCESS_MESSAGE')
+            : this.$t('AUTOMATION.ADD.API.SUCCESS_MESSAGE');
+
+        await await this.$store.dispatch(action, payload);
+        this.showAlert(this.$t(successMessage));
         this.hideAddPopup();
+        this.hideEditPopup();
       } catch (error) {
-        this.showAlert(this.$t('AUTOMATION.ADD.API.ERROR_MESSAGE'));
+        const errorMessage =
+          mode === 'edit'
+            ? this.$t('AUTOMATION.EDIT.API.ERROR_MESSAGE')
+            : this.$t('AUTOMATION.ADD.API.ERROR_MESSAGE');
+        this.showAlert(errorMessage);
       }
     },
     readableTime(date) {
diff --git a/app/javascript/dashboard/store/modules/automations.js b/app/javascript/dashboard/store/modules/automations.js
index 405118707..28c422e79 100644
--- a/app/javascript/dashboard/store/modules/automations.js
+++ b/app/javascript/dashboard/store/modules/automations.js
@@ -8,6 +8,7 @@ export const state = {
     isFetching: false,
     isCreating: false,
     isDeleting: false,
+    isUpdating: false,
   },
 };
 
@@ -76,7 +77,7 @@ export const mutations = {
   },
   [types.ADD_AUTOMATION]: MutationHelpers.create,
   [types.SET_AUTOMATIONS]: MutationHelpers.set,
-  // [types.EDIT_AUTOMATION]: MutationHelpers.update,
+  [types.EDIT_AUTOMATION]: MutationHelpers.update,
   [types.DELETE_AUTOMATION]: MutationHelpers.destroy,
 };
 

From e99ea0b5821cd13438ade966ce279e3f636c70f7 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 2 Feb 2022 19:37:33 +0530
Subject: [PATCH 049/101] feat: Email signature API support (#3874)

---
 app/controllers/api/v1/profiles_controller.rb |  2 +
 app/models/super_admin.rb                     | 56 ++++++++++---------
 app/models/user.rb                            | 56 ++++++++++---------
 app/views/api/v1/models/_user.json.jbuilder   |  2 +
 .../api/v1/models/_user.json.jbuilder         |  2 +
 ...20131081750_add_email_signature_to_user.rb |  8 +++
 db/schema.rb                                  |  4 +-
 .../api/v1/profiles_controller_spec.rb        | 18 ++++++
 8 files changed, 93 insertions(+), 55 deletions(-)
 create mode 100644 db/migrate/20220131081750_add_email_signature_to_user.rb

diff --git a/app/controllers/api/v1/profiles_controller.rb b/app/controllers/api/v1/profiles_controller.rb
index b915f0775..c810500f9 100644
--- a/app/controllers/api/v1/profiles_controller.rb
+++ b/app/controllers/api/v1/profiles_controller.rb
@@ -38,6 +38,8 @@ class Api::V1::ProfilesController < Api::BaseController
       :name,
       :display_name,
       :avatar,
+      :message_signature,
+      :message_signature_enabled,
       ui_settings: {}
     )
   end
diff --git a/app/models/super_admin.rb b/app/models/super_admin.rb
index acc5f28dd..2ce658000 100644
--- a/app/models/super_admin.rb
+++ b/app/models/super_admin.rb
@@ -2,33 +2,35 @@
 #
 # Table name: users
 #
-#  id                     :integer          not null, primary key
-#  availability           :integer          default("online")
-#  confirmation_sent_at   :datetime
-#  confirmation_token     :string
-#  confirmed_at           :datetime
-#  current_sign_in_at     :datetime
-#  current_sign_in_ip     :string
-#  custom_attributes      :jsonb
-#  display_name           :string
-#  email                  :string
-#  encrypted_password     :string           default(""), not null
-#  last_sign_in_at        :datetime
-#  last_sign_in_ip        :string
-#  name                   :string           not null
-#  provider               :string           default("email"), not null
-#  pubsub_token           :string
-#  remember_created_at    :datetime
-#  reset_password_sent_at :datetime
-#  reset_password_token   :string
-#  sign_in_count          :integer          default(0), not null
-#  tokens                 :json
-#  type                   :string
-#  ui_settings            :jsonb
-#  uid                    :string           default(""), not null
-#  unconfirmed_email      :string
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
+#  id                        :integer          not null, primary key
+#  availability              :integer          default("online")
+#  confirmation_sent_at      :datetime
+#  confirmation_token        :string
+#  confirmed_at              :datetime
+#  current_sign_in_at        :datetime
+#  current_sign_in_ip        :string
+#  custom_attributes         :jsonb
+#  display_name              :string
+#  email                     :string
+#  encrypted_password        :string           default(""), not null
+#  last_sign_in_at           :datetime
+#  last_sign_in_ip           :string
+#  message_signature         :text
+#  message_signature_enabled :boolean          default(FALSE), not null
+#  name                      :string           not null
+#  provider                  :string           default("email"), not null
+#  pubsub_token              :string
+#  remember_created_at       :datetime
+#  reset_password_sent_at    :datetime
+#  reset_password_token      :string
+#  sign_in_count             :integer          default(0), not null
+#  tokens                    :json
+#  type                      :string
+#  ui_settings               :jsonb
+#  uid                       :string           default(""), not null
+#  unconfirmed_email         :string
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index 773277e15..4a1fa249e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,33 +2,35 @@
 #
 # Table name: users
 #
-#  id                     :integer          not null, primary key
-#  availability           :integer          default("online")
-#  confirmation_sent_at   :datetime
-#  confirmation_token     :string
-#  confirmed_at           :datetime
-#  current_sign_in_at     :datetime
-#  current_sign_in_ip     :string
-#  custom_attributes      :jsonb
-#  display_name           :string
-#  email                  :string
-#  encrypted_password     :string           default(""), not null
-#  last_sign_in_at        :datetime
-#  last_sign_in_ip        :string
-#  name                   :string           not null
-#  provider               :string           default("email"), not null
-#  pubsub_token           :string
-#  remember_created_at    :datetime
-#  reset_password_sent_at :datetime
-#  reset_password_token   :string
-#  sign_in_count          :integer          default(0), not null
-#  tokens                 :json
-#  type                   :string
-#  ui_settings            :jsonb
-#  uid                    :string           default(""), not null
-#  unconfirmed_email      :string
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
+#  id                        :integer          not null, primary key
+#  availability              :integer          default("online")
+#  confirmation_sent_at      :datetime
+#  confirmation_token        :string
+#  confirmed_at              :datetime
+#  current_sign_in_at        :datetime
+#  current_sign_in_ip        :string
+#  custom_attributes         :jsonb
+#  display_name              :string
+#  email                     :string
+#  encrypted_password        :string           default(""), not null
+#  last_sign_in_at           :datetime
+#  last_sign_in_ip           :string
+#  message_signature         :text
+#  message_signature_enabled :boolean          default(FALSE), not null
+#  name                      :string           not null
+#  provider                  :string           default("email"), not null
+#  pubsub_token              :string
+#  remember_created_at       :datetime
+#  reset_password_sent_at    :datetime
+#  reset_password_token      :string
+#  sign_in_count             :integer          default(0), not null
+#  tokens                    :json
+#  type                      :string
+#  ui_settings               :jsonb
+#  uid                       :string           default(""), not null
+#  unconfirmed_email         :string
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #
 # Indexes
 #
diff --git a/app/views/api/v1/models/_user.json.jbuilder b/app/views/api/v1/models/_user.json.jbuilder
index 39c552c40..a2f80e1f4 100644
--- a/app/views/api/v1/models/_user.json.jbuilder
+++ b/app/views/api/v1/models/_user.json.jbuilder
@@ -4,6 +4,8 @@ json.available_name resource.available_name
 json.avatar_url resource.avatar_url
 json.confirmed resource.confirmed?
 json.display_name resource.display_name
+json.message_signature_enabled resource.message_signature_enabled
+json.message_signature resource.message_signature
 json.email resource.email
 json.hmac_identifier resource.hmac_identifier if GlobalConfig.get('CHATWOOT_INBOX_HMAC_KEY')['CHATWOOT_INBOX_HMAC_KEY'].present?
 json.id resource.id
diff --git a/app/views/platform/api/v1/models/_user.json.jbuilder b/app/views/platform/api/v1/models/_user.json.jbuilder
index 4c50efaaa..fcc151e02 100644
--- a/app/views/platform/api/v1/models/_user.json.jbuilder
+++ b/app/views/platform/api/v1/models/_user.json.jbuilder
@@ -4,6 +4,8 @@ json.available_name resource.available_name
 json.avatar_url resource.avatar_url
 json.confirmed resource.confirmed?
 json.display_name resource.display_name
+json.message_signature_enabled resource.message_signature_enabled
+json.message_signature resource.message_signature
 json.email resource.email
 json.id resource.id
 json.name resource.name
diff --git a/db/migrate/20220131081750_add_email_signature_to_user.rb b/db/migrate/20220131081750_add_email_signature_to_user.rb
new file mode 100644
index 000000000..54edc049e
--- /dev/null
+++ b/db/migrate/20220131081750_add_email_signature_to_user.rb
@@ -0,0 +1,8 @@
+class AddEmailSignatureToUser < ActiveRecord::Migration[6.1]
+  def change
+    change_table :users, bulk: true do |t|
+      t.boolean :message_signature_enabled, null: false, default: false
+      t.text :message_signature, null: true
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b963cae8d..27da2435d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_01_21_055444) do
+ActiveRecord::Schema.define(version: 2022_01_31_081750) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -747,6 +747,8 @@ ActiveRecord::Schema.define(version: 2022_01_21_055444) do
     t.jsonb "ui_settings", default: {}
     t.jsonb "custom_attributes", default: {}
     t.string "type"
+    t.boolean "message_signature_enabled", default: false, null: false
+    t.text "message_signature"
     t.index ["email"], name: "index_users_on_email"
     t.index ["pubsub_token"], name: "index_users_on_pubsub_token", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 39a936a90..27763aa12 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -26,6 +26,8 @@ RSpec.describe 'Profile API', type: :request do
         expect(json_response['email']).to eq(agent.email)
         expect(json_response['access_token']).to eq(agent.access_token.token)
         expect(json_response['custom_attributes']['test']).to eq('test')
+        expect(json_response['message_signature']).to be_nil
+        expect(json_response['message_signature_enabled']).to be_falsey
       end
     end
   end
@@ -56,6 +58,22 @@ RSpec.describe 'Profile API', type: :request do
         expect(agent.name).to eq('test')
       end
 
+      it 'updates the message_signature' do
+        put '/api/v1/profile',
+            params: { profile: { name: 'test', message_signature: 'Thanks\nMy Signature', message_signature_enabled: true } },
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        agent.reload
+        expect(json_response['id']).to eq(agent.id)
+        expect(json_response['name']).to eq(agent.name)
+        expect(agent.name).to eq('test')
+        expect(json_response['message_signature']).to eq('Thanks\nMy Signature')
+        expect(json_response['message_signature_enabled']).to be_truthy
+      end
+
       it 'updates the password when current password is provided' do
         put '/api/v1/profile',
             params: { profile: { current_password: 'Test123!', password: 'Test1234!', password_confirmation: 'Test1234!' } },

From 8821106da9fff246cee533631111dbb7074e7726 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 3 Feb 2022 03:51:17 +0530
Subject: [PATCH 050/101] Fix: Added the backend validation for name (#3878)

- Added the backend validation for name
- Add message size constraint
---
 app/models/account.rb                             |  1 +
 app/models/contact.rb                             |  1 +
 app/models/message.rb                             |  1 +
 app/models/user.rb                                |  2 +-
 .../api/v1/accounts/contacts_controller_spec.rb   | 12 ++++++++++++
 .../conversations/messages_controller_spec.rb     | 15 +++++++++++++++
 .../api/v1/accounts_controller_spec.rb            | 13 +++++++++++++
 .../api/v1/profiles_controller_spec.rb            | 12 ++++++++++++
 .../api/v1/widget/messages_controller_spec.rb     | 15 +++++++++++++++
 .../api/v1/inbox/messages_controller_spec.rb      | 12 ++++++++++++
 10 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 140cef072..10e022aa4 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -33,6 +33,7 @@ class Account < ApplicationRecord
 
   validates :name, presence: true
   validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 999, allow_nil: true }
+  validates :name, length: { maximum: 255 }
 
   has_many :account_users, dependent: :destroy_async
   has_many :agent_bot_inboxes, dependent: :destroy_async
diff --git a/app/models/contact.rb b/app/models/contact.rb
index ebddb6828..106930db4 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -36,6 +36,7 @@ class Contact < ApplicationRecord
   validates :phone_number,
             allow_blank: true, uniqueness: { scope: [:account_id] },
             format: { with: /\+[1-9]\d{1,14}\z/, message: 'should be in e164 format' }
+  validates :name, length: { maximum: 255 }
 
   belongs_to :account
   has_many :conversations, dependent: :destroy_async
diff --git a/app/models/message.rb b/app/models/message.rb
index e8f3c3727..7f2655b35 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -39,6 +39,7 @@ class Message < ApplicationRecord
   validates :conversation_id, presence: true
   validates_with ContentAttributeValidator
   validates :content_type, presence: true
+  validates :content, length: { maximum: 150_000 }
 
   # when you have a temperory id in your frontend and want it echoed back via action cable
   attr_accessor :echo_id
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a1fa249e..d28c40d6a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,7 +68,7 @@ class User < ApplicationRecord
   # validates_uniqueness_of :email, scope: :account_id
 
   validates :email, :name, presence: true
-  validates_length_of :name, minimum: 1
+  validates_length_of :name, minimum: 1, maximum: 255
 
   has_many :account_users, dependent: :destroy_async
   has_many :accounts, through: :account_users
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 6975fa015..44e47dab7 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -387,6 +387,18 @@ RSpec.describe 'Contacts API', type: :request do
         expect(json_response['payload']['contact']['custom_attributes']).to eq({ 'test' => 'test', 'test1' => 'test1' })
       end
 
+      it 'does not create the contact' do
+        valid_params[:contact][:name] = 'test' * 999
+
+        post "/api/v1/accounts/#{account.id}/contacts", headers: admin.create_new_auth_token,
+                                                        params: valid_params
+
+        expect(response).to have_http_status(:unprocessable_entity)
+
+        json_response = JSON.parse(response.body)
+        expect(json_response['message']).to eq('Name is too long (maximum is 255 characters)')
+      end
+
       it 'creates the contact inbox when inbox id is passed' do
         expect do
           post "/api/v1/accounts/#{account.id}/contacts", headers: admin.create_new_auth_token,
diff --git a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
index 605e75b56..637b36192 100644
--- a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb
@@ -35,6 +35,21 @@ RSpec.describe 'Conversation Messages API', type: :request do
         expect(conversation.messages.first.content).to eq(params[:content])
       end
 
+      it 'does not create the message' do
+        params = { content: "#{'h' * 150 * 1000}a", private: true }
+
+        post api_v1_account_conversation_messages_url(account_id: account.id, conversation_id: conversation.display_id),
+             params: params,
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+
+        json_response = JSON.parse(response.body)
+
+        expect(json_response['error']).to eq('Validation failed: Content is too long (maximum is 150000 characters)')
+      end
+
       it 'creates an outgoing text message with a specific bot sender' do
         agent_bot = create(:agent_bot)
         time_stamp = Time.now.utc.to_s
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 76d32eeaa..e86834d88 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -158,6 +158,19 @@ RSpec.describe 'Accounts API', type: :request do
         expect(account.reload.support_email).to eq(params[:support_email])
         expect(account.reload.auto_resolve_duration).to eq(params[:auto_resolve_duration])
       end
+
+      it 'Throws error 422' do
+        params[:name] = 'test' * 999
+
+        put "/api/v1/accounts/#{account.id}",
+            params: params,
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        json_response = JSON.parse(response.body)
+        expect(json_response['message']).to eq('Name is too long (maximum is 255 characters)')
+      end
     end
   end
 
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 27763aa12..77cd77bfe 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -93,6 +93,18 @@ RSpec.describe 'Profile API', type: :request do
         expect(response).to have_http_status(:unprocessable_entity)
       end
 
+      it 'validate name' do
+        user_name = 'test' * 999
+        put '/api/v1/profile',
+            params: { profile: { name: user_name } },
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        json_response = JSON.parse(response.body)
+        expect(json_response['message']).to eq('Name is too long (maximum is 255 characters)')
+      end
+
       it 'updates avatar' do
         # no avatar before upload
         expect(agent.avatar.attached?).to eq(false)
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index a8120d93e..eac1c2993 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -45,6 +45,21 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
         expect(json_response['content']).to eq(message_params[:content])
       end
 
+      it 'does not create the message' do
+        conversation.destroy # Test all params
+        message_params = { content: "#{'h' * 150 * 1000}a", timestamp: Time.current }
+        post api_v1_widget_messages_url,
+             params: { website_token: web_widget.website_token, message: message_params },
+             headers: { 'X-Auth-Token' => token },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+
+        json_response = JSON.parse(response.body)
+
+        expect(json_response['message']).to eq('Content is too long (maximum is 150000 characters)')
+      end
+
       it 'creates attachment message in conversation' do
         file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
         message_params = { content: 'hello world', timestamp: Time.current, attachments: [file] }
diff --git a/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb b/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
index 530efc4be..54c1cc2cd 100644
--- a/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
@@ -28,6 +28,18 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
       expect(data['content']).to eq('hello')
     end
 
+    it 'does not create the message' do
+      content = "#{'h' * 150 * 1000}a"
+      post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{conversation.display_id}/messages",
+           params: { content: content }
+
+      expect(response).to have_http_status(:unprocessable_entity)
+
+      json_response = JSON.parse(response.body)
+
+      expect(json_response['message']).to eq('Content is too long (maximum is 150000 characters)')
+    end
+
     it 'creates attachment message in conversation' do
       file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
       post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{conversation.display_id}/messages",

From fc1f25779316fdfaffbe0b54c90b4ef003f8b824 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 3 Feb 2022 09:14:22 +0530
Subject: [PATCH 051/101] feat: Clone automation rules (#3893)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/dashboard/api/automation.js    |  5 ++
 .../dashboard/api/specs/automation.spec.js    |  1 +
 .../dashboard/i18n/locale/en/automation.json  |  7 +++
 .../dashboard/settings/automation/Index.vue   | 18 ++++--
 .../dashboard/store/modules/automations.js    | 10 ++++
 .../modules/specs/automations/actions.spec.js | 55 +++++++++++--------
 6 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/app/javascript/dashboard/api/automation.js b/app/javascript/dashboard/api/automation.js
index 3c354307d..e83ece3d1 100644
--- a/app/javascript/dashboard/api/automation.js
+++ b/app/javascript/dashboard/api/automation.js
@@ -1,9 +1,14 @@
+/* global axios */
 import ApiClient from './ApiClient';
 
 class AutomationsAPI extends ApiClient {
   constructor() {
     super('automation_rules', { accountScoped: true });
   }
+
+  clone(automationId) {
+    return axios.post(`${this.url}/${automationId}/clone`);
+  }
 }
 
 export default new AutomationsAPI();
diff --git a/app/javascript/dashboard/api/specs/automation.spec.js b/app/javascript/dashboard/api/specs/automation.spec.js
index c236b5ce3..2ab4cae82 100644
--- a/app/javascript/dashboard/api/specs/automation.spec.js
+++ b/app/javascript/dashboard/api/specs/automation.spec.js
@@ -9,6 +9,7 @@ describe('#AutomationsAPI', () => {
     expect(automations).toHaveProperty('create');
     expect(automations).toHaveProperty('update');
     expect(automations).toHaveProperty('delete');
+    expect(automations).toHaveProperty('clone');
     expect(automations.url).toBe('/api/v1/automation_rules');
   });
 });
diff --git a/app/javascript/dashboard/i18n/locale/en/automation.json b/app/javascript/dashboard/i18n/locale/en/automation.json
index fa0dda7fc..ee78de7c8 100644
--- a/app/javascript/dashboard/i18n/locale/en/automation.json
+++ b/app/javascript/dashboard/i18n/locale/en/automation.json
@@ -71,6 +71,13 @@
         "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
       }
     },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
     "FORM": {
       "EDIT": "Edit",
       "CREATE": "Create",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 6c1892a28..39fe9c71f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -54,17 +54,17 @@
                   @click="openEditPopup(automation)"
                 >
                 </woot-button>
-                <!-- <woot-button
-                  v-tooltip.top="'Clone'"
+                <woot-button
+                  v-tooltip.top="$t('AUTOMATION.CLONE.TOOLTIP')"
                   variant="smooth"
                   size="tiny"
                   color-scheme="primary"
                   class-names="grey-btn"
                   :is-loading="loading[automation.id]"
                   icon="copy"
-                  @click="openEditPopup(automation)"
+                  @click="cloneAutomation(automation.id)"
                 >
-                </woot-button> -->
+                </woot-button>
                 <woot-button
                   v-tooltip.top="$t('AUTOMATION.FORM.DELETE')"
                   variant="smooth"
@@ -204,6 +204,16 @@ export default {
         this.showAlert(this.$t('AUTOMATION.DELETE.API.ERROR_MESSAGE'));
       }
     },
+    async cloneAutomation(id) {
+      try {
+        await this.$store.dispatch('automations/clone', id);
+        this.showAlert(this.$t('AUTOMATION.CLONE.API.SUCCESS_MESSAGE'));
+        this.$store.dispatch('automations/get');
+        this.loading[this.selectedResponse.id] = false;
+      } catch (error) {
+        this.showAlert(this.$t('AUTOMATION.CLONE.API.ERROR_MESSAGE'));
+      }
+    },
     async submitAutomation(payload, mode) {
       try {
         const action =
diff --git a/app/javascript/dashboard/store/modules/automations.js b/app/javascript/dashboard/store/modules/automations.js
index 28c422e79..bd59f2484 100644
--- a/app/javascript/dashboard/store/modules/automations.js
+++ b/app/javascript/dashboard/store/modules/automations.js
@@ -66,6 +66,16 @@ export const actions = {
       commit(types.SET_AUTOMATION_UI_FLAG, { isDeleting: false });
     }
   },
+  clone: async ({ commit }, id) => {
+    commit(types.SET_AUTOMATION_UI_FLAG, { isCloning: true });
+    try {
+      await AutomationAPI.clone(id);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_AUTOMATION_UI_FLAG, { isCloning: false });
+    }
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
index 8dbc08f00..9ac38a5bc 100644
--- a/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
@@ -47,28 +47,28 @@ describe('#actions', () => {
       ]);
     });
   });
-  // API Work in progress
-  // describe('#update', () => {
-  //   it('sends correct actions if API is success', async () => {
-  //     axios.patch.mockResolvedValue({ data: automationsList[0] });
-  //     await actions.update({ commit }, automationsList[0]);
-  //     expect(commit.mock.calls).toEqual([
-  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: true }],
-  //       [types.default.EDIT_AUTOMATION, automationsList[0]],
-  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: false }],
-  //     ]);
-  //   });
-  //   it('sends correct actions if API is error', async () => {
-  //     axios.patch.mockRejectedValue({ message: 'Incorrect header' });
-  //     await expect(
-  //       actions.update({ commit }, automationsList[0])
-  //     ).rejects.toThrow(Error);
-  //     expect(commit.mock.calls).toEqual([
-  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: true }],
-  //       [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: false }],
-  //     ]);
-  //   });
-  // });
+
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({ data: automationsList[0] });
+      await actions.update({ commit }, automationsList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: true }],
+        [types.default.EDIT_AUTOMATION, automationsList[0]],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.update({ commit }, automationsList[0])
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: true }],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+  });
 
   describe('#delete', () => {
     it('sends correct actions if API is success', async () => {
@@ -91,4 +91,15 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#clone', () => {
+    it('clones the automation', async () => {
+      axios.post.mockResolvedValue({ data: automationsList[0] });
+      await actions.clone({ commit }, automationsList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AUTOMATION_UI_FLAG, { isCloning: true }],
+        [types.default.SET_AUTOMATION_UI_FLAG, { isCloning: false }],
+      ]);
+    });
+  });
 });

From 903072ef14807b3ae96596951452d30b412bd237 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 3 Feb 2022 10:05:56 +0530
Subject: [PATCH 052/101] chore: Add custom attributes in conversation webhook
 payload (#3839)

---
 app/presenters/conversations/event_data_presenter.rb       | 1 +
 spec/models/conversation_spec.rb                           | 1 +
 spec/presenters/conversations/event_data_presenter_spec.rb | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb
index b4a443f35..9f3b1dced 100644
--- a/app/presenters/conversations/event_data_presenter.rb
+++ b/app/presenters/conversations/event_data_presenter.rb
@@ -10,6 +10,7 @@ class Conversations::EventDataPresenter < SimpleDelegator
       messages: push_messages,
       meta: push_meta,
       status: status,
+      custom_attributes: custom_attributes,
       snoozed_until: snoozed_until,
       unread_count: unread_incoming_messages.count,
       **push_timestamps
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 67a6c7c83..555957e77 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -386,6 +386,7 @@ RSpec.describe Conversation, type: :model do
         can_reply: true,
         channel: 'Channel::WebWidget',
         snoozed_until: conversation.snoozed_until,
+        custom_attributes: conversation.custom_attributes,
         contact_last_seen_at: conversation.contact_last_seen_at.to_i,
         agent_last_seen_at: conversation.agent_last_seen_at.to_i,
         unread_count: 0
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index 88cd89f0a..b22057435 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -24,6 +24,7 @@ RSpec.describe Conversations::EventDataPresenter do
         channel: conversation.inbox.channel_type,
         timestamp: conversation.last_activity_at.to_i,
         snoozed_until: conversation.snoozed_until,
+        custom_attributes: conversation.custom_attributes,
         contact_last_seen_at: conversation.contact_last_seen_at.to_i,
         agent_last_seen_at: conversation.agent_last_seen_at.to_i,
         unread_count: 0

From dbb50e59233d1bf7c78093e78432b7b42f181b0d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 3 Feb 2022 10:11:02 +0530
Subject: [PATCH 053/101] fix: Update font-size/width to fix iOS input zoom
 (#3894)

---
 app/javascript/widget/assets/scss/_forms.scss            | 4 ++--
 app/javascript/widget/components/ChatInputWrap.vue       | 3 ++-
 app/javascript/widget/components/template/EmailInput.vue | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/javascript/widget/assets/scss/_forms.scss b/app/javascript/widget/assets/scss/_forms.scss
index 6ea4666aa..05d3fd26d 100755
--- a/app/javascript/widget/assets/scss/_forms.scss
+++ b/app/javascript/widget/assets/scss/_forms.scss
@@ -15,9 +15,9 @@ $input-height: $space-two * 2;
   color: $color-body;
   display: block;
   font-family: $font-family;
-  font-size: $font-size-default;
+  font-size: $font-size-medium;
   height: $input-height;
-  line-height: 1.3;
+  line-height: 1.5;
   max-width: 100%;
   outline: none;
   padding: $space-smaller;
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index e9f00773e..741eb67b2 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -196,7 +196,8 @@ export default {
   max-height: 2.4 * $space-mega;
   resize: none;
   padding: 0;
-  padding-top: $space-small;
+  padding-top: $space-smaller;
+  padding-bottom: $space-smaller;
   margin-top: $space-small;
   margin-bottom: $space-small;
 }
diff --git a/app/javascript/widget/components/template/EmailInput.vue b/app/javascript/widget/components/template/EmailInput.vue
index d133ccda3..096870b73 100644
--- a/app/javascript/widget/components/template/EmailInput.vue
+++ b/app/javascript/widget/components/template/EmailInput.vue
@@ -103,7 +103,7 @@ export default {
     border-bottom-right-radius: 0;
     border-top-right-radius: 0;
     padding: $space-one;
-    width: auto;
+    width: 100%;
 
     &.error {
       border-color: $color-error;

From 8dcb4a5ed418128be4dd8aa07d38d2091798a8f9 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 3 Feb 2022 12:05:39 +0530
Subject: [PATCH 054/101] chore: Add resolve action in Dialogflow Integration
 (#3900)

---
 lib/integrations/dialogflow/processor_service.rb   |  2 ++
 .../dialogflow/processor_service_spec.rb           | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/integrations/dialogflow/processor_service.rb b/lib/integrations/dialogflow/processor_service.rb
index bb5485296..e9dfa8fb2 100644
--- a/lib/integrations/dialogflow/processor_service.rb
+++ b/lib/integrations/dialogflow/processor_service.rb
@@ -77,6 +77,8 @@ class Integrations::Dialogflow::ProcessorService
     case action
     when 'handoff'
       message.conversation.open!
+    when 'resolve'
+      message.conversation.resolved!
     end
   end
 end
diff --git a/spec/lib/integrations/dialogflow/processor_service_spec.rb b/spec/lib/integrations/dialogflow/processor_service_spec.rb
index 3971482d9..e002e1c3e 100644
--- a/spec/lib/integrations/dialogflow/processor_service_spec.rb
+++ b/spec/lib/integrations/dialogflow/processor_service_spec.rb
@@ -75,6 +75,20 @@ describe Integrations::Dialogflow::ProcessorService do
       end
     end
 
+    context 'when dialogflow returns resolve action' do
+      let(:dialogflow_response) do
+        ActiveSupport::HashWithIndifferentAccess.new(
+          fulfillment_messages: [{ payload: { action: 'resolve' } }, { text: dialogflow_text_double }]
+        )
+      end
+
+      it 'resolves the conversation without moving it to an agent' do
+        processor.perform
+        expect(conversation.reload.status).to eql('resolved')
+        expect(conversation.messages.last.content).to eql('hello payload')
+      end
+    end
+
     context 'when conversation is not bot' do
       let(:conversation) { create(:conversation, account: account, status: :open) }
 

From 5c6958482f55c5fe0ac1e0cb2674ba2cade517e7 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 3 Feb 2022 12:14:34 +0530
Subject: [PATCH 055/101] fix: Shows tooltip and avatar for template messages
 (#3898)

---
 .../widgets/conversation/Message.vue          | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 97fda5bcf..a71ba13d0 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -64,7 +64,7 @@
       >
         <woot-thumbnail
           :src="sender.thumbnail"
-          :username="sender.name"
+          :username="senderNameForAvatar"
           size="16px"
         />
         <a
@@ -248,6 +248,9 @@ export default {
     isOutgoing() {
       return this.data.message_type === MESSAGE_TYPE.OUTGOING;
     },
+    isTemplate() {
+      return this.data.message_type === MESSAGE_TYPE.TEMPLATE;
+    },
     emailHeadAttributes() {
       return {
         email: this.contentAttributes.email,
@@ -265,8 +268,12 @@ export default {
       return !!this.data.content;
     },
     tooltipForSender() {
-      const { name = this.$t('CONVERSATION.BOT') } = this.sender || {};
-      return this.data.message_type === MESSAGE_TYPE.OUTGOING
+      const name = this.senderNameForAvatar;
+      const { message_type: messageType } = this.data;
+      const showTooltip =
+        messageType === MESSAGE_TYPE.OUTGOING ||
+        messageType === MESSAGE_TYPE.TEMPLATE;
+      return showTooltip
         ? {
             content: `${this.$t('CONVERSATION.SENT_BY')} ${name}`,
             classes: 'top',
@@ -323,11 +330,18 @@ export default {
       return meta ? meta.error : '';
     },
     showAvatar() {
-      if (this.isOutgoing) {
-        return this.sender;
+      if (this.isOutgoing || this.isTemplate) {
+        return true;
       }
       return this.isATweet && this.isIncoming && this.sender;
     },
+    senderNameForAvatar() {
+      if (this.isOutgoing || this.isTemplate) {
+        const { name = this.$t('CONVERSATION.BOT') } = this.sender || {};
+        return name;
+      }
+      return '';
+    },
   },
   watch: {
     data() {

From fba7f40beece9559c8fc2e778b647b8aae542013 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 3 Feb 2022 14:39:47 +0530
Subject: [PATCH 056/101] Fix: Custom filter distinct select (#3895)

---
 app/services/contacts/filter_service.rb       | 2 +-
 spec/services/contacts/filter_service_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/contacts/filter_service.rb b/app/services/contacts/filter_service.rb
index cc90b8502..aaa7412d4 100644
--- a/app/services/contacts/filter_service.rb
+++ b/app/services/contacts/filter_service.rb
@@ -18,7 +18,7 @@ class Contacts::FilterService < FilterService
       @query_string += contact_query_string(current_filter, query_hash, current_index)
     end
 
-    base_relation.select('distinct contacts.id').where(@query_string, @filter_values.with_indifferent_access)
+    base_relation.where(@query_string, @filter_values.with_indifferent_access)
   end
 
   def contact_query_string(current_filter, query_hash, current_index)
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index 14f4c1d27..f52a6c934 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -55,7 +55,7 @@ describe ::Contacts::FilterService do
             attribute_key: 'browser_language',
             filter_operator: 'equal_to',
             values: ['en'],
-            query_operator: 'AND'
+            query_operator: 'OR'
           }.with_indifferent_access,
           {
             attribute_key: 'name',
@@ -69,7 +69,7 @@ describe ::Contacts::FilterService do
       it 'filter contacts by additional_attributes' do
         params[:payload] = payload
         result = filter_service.new(params, user_1).perform
-        expect(result[:contacts].length).to be 1
+        expect(result[:count]).to be 2
       end
 
       it 'filter contact by tags' do

From cf10f3d03b666cd45b45df5d1fee28a533a21b46 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 3 Feb 2022 15:22:13 -0800
Subject: [PATCH 057/101] chore: Provider APIs for SMS Channel - Bandwidth
 (#3889)

fixes: #3888
---
 app/builders/contact_inbox_builder.rb         |  20 +-
 .../api/v1/accounts/inboxes_controller.rb     |  41 ++--
 app/controllers/webhooks/sms_controller.rb    |   6 +
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  52 ++++-
 .../settings/campaigns/AddCampaign.vue        |   2 +-
 .../settings/campaigns/EditCampaign.vue       |   2 +-
 .../dashboard/settings/inbox/ChannelList.vue  |   2 +-
 .../dashboard/settings/inbox/FinishSetup.vue  |  24 ++-
 .../routes/dashboard/settings/inbox/Index.vue |   3 +
 .../settings/inbox/channels/BandwidthSms.vue  | 181 ++++++++++++++++++
 .../dashboard/settings/inbox/channels/Sms.vue |  23 ++-
 .../dashboard/store/modules/inboxes.js        |   6 +-
 .../store/modules/specs/inboxes/fixtures.js   |   7 +
 .../modules/specs/inboxes/getters.spec.js     |   6 +-
 app/javascript/shared/mixins/inboxMixin.js    |   1 +
 app/jobs/send_reply_job.rb                    |  21 +-
 app/jobs/webhooks/sms_events_job.rb           |  13 ++
 app/models/account.rb                         |   1 +
 app/models/campaign.rb                        |   5 +-
 app/models/channel/sms.rb                     |  81 ++++++++
 app/models/channel/whatsapp.rb                |   2 +-
 app/models/inbox.rb                           |   2 +
 .../contacts/contactable_inboxes_service.rb   |   8 +
 app/services/sms/incoming_message_service.rb  |  66 +++++++
 .../sms/oneoff_sms_campaign_service.rb        |  32 ++++
 app/services/sms/send_on_sms_service.rb       |  16 ++
 config/routes.rb                              |   1 +
 db/migrate/20220129024443_add_sms_channel.rb  |  11 ++
 db/schema.rb                                  |  10 +
 spec/builders/contact_inbox_builder_spec.rb   |  47 +++++
 .../v1/accounts/inboxes_controller_spec.rb    |  12 ++
 .../webhooks/sms_controller_spec.rb           |  12 ++
 spec/factories/channel/channel_sms.rb         |  16 ++
 spec/jobs/send_reply_job_spec.rb              |   9 +
 spec/jobs/webhooks/sms_events_job_spec.rb     |  56 ++++++
 spec/models/campaign_spec.rb                  |  21 ++
 .../contactable_inboxes_service_spec.rb       |   6 +-
 .../sms/incoming_message_service_spec.rb      |  31 +++
 .../sms/oneoff_sms_campaign_service_spec.rb   |  47 +++++
 spec/services/sms/send_on_sms_service_spec.rb |  28 +++
 40 files changed, 879 insertions(+), 51 deletions(-)
 create mode 100644 app/controllers/webhooks/sms_controller.rb
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BandwidthSms.vue
 create mode 100644 app/jobs/webhooks/sms_events_job.rb
 create mode 100644 app/models/channel/sms.rb
 create mode 100644 app/services/sms/incoming_message_service.rb
 create mode 100644 app/services/sms/oneoff_sms_campaign_service.rb
 create mode 100644 app/services/sms/send_on_sms_service.rb
 create mode 100644 db/migrate/20220129024443_add_sms_channel.rb
 create mode 100644 spec/controllers/webhooks/sms_controller_spec.rb
 create mode 100644 spec/factories/channel/channel_sms.rb
 create mode 100644 spec/jobs/webhooks/sms_events_job_spec.rb
 create mode 100644 spec/services/sms/incoming_message_service_spec.rb
 create mode 100644 spec/services/sms/oneoff_sms_campaign_service_spec.rb
 create mode 100644 spec/services/sms/send_on_sms_service_spec.rb

diff --git a/app/builders/contact_inbox_builder.rb b/app/builders/contact_inbox_builder.rb
index 8ee1b3fec..e7ae8b0aa 100644
--- a/app/builders/contact_inbox_builder.rb
+++ b/app/builders/contact_inbox_builder.rb
@@ -4,7 +4,7 @@ class ContactInboxBuilder
   def perform
     @contact = Contact.find(contact_id)
     @inbox = @contact.account.inboxes.find(inbox_id)
-    return unless ['Channel::TwilioSms', 'Channel::Email', 'Channel::Api', 'Channel::Whatsapp'].include? @inbox.channel_type
+    return unless ['Channel::TwilioSms', 'Channel::Sms', 'Channel::Email', 'Channel::Api', 'Channel::Whatsapp'].include? @inbox.channel_type
 
     source_id = @source_id || generate_source_id
     create_contact_inbox(source_id) if source_id.present?
@@ -13,12 +13,18 @@ class ContactInboxBuilder
   private
 
   def generate_source_id
-    return twilio_source_id if @inbox.channel_type == 'Channel::TwilioSms'
-    return wa_source_id if @inbox.channel_type == 'Channel::Whatsapp'
-    return @contact.email if @inbox.channel_type == 'Channel::Email'
-    return SecureRandom.uuid if @inbox.channel_type == 'Channel::Api'
-
-    nil
+    case @inbox.channel_type
+    when 'Channel::TwilioSms'
+      twilio_source_id
+    when 'Channel::Whatsapp'
+      wa_source_id
+    when 'Channel::Email'
+      @contact.email
+    when 'Channel::Sms'
+      @contact.phone_number
+    when 'Channel::Api'
+      SecureRandom.uuid
+    end
   end
 
   def wa_source_id
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 9f2cfba8c..62a471cda 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -91,20 +91,9 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def create_channel
-    case permitted_params[:channel][:type]
-    when 'web_widget'
-      Current.account.web_widgets.create!(permitted_params(Channel::WebWidget::EDITABLE_ATTRS)[:channel].except(:type))
-    when 'api'
-      Current.account.api_channels.create!(permitted_params(Channel::Api::EDITABLE_ATTRS)[:channel].except(:type))
-    when 'email'
-      Current.account.email_channels.create!(permitted_params(Channel::Email::EDITABLE_ATTRS)[:channel].except(:type))
-    when 'line'
-      Current.account.line_channels.create!(permitted_params(Channel::Line::EDITABLE_ATTRS)[:channel].except(:type))
-    when 'telegram'
-      Current.account.telegram_channels.create!(permitted_params(Channel::Telegram::EDITABLE_ATTRS)[:channel].except(:type))
-    when 'whatsapp'
-      Current.account.whatsapp_channels.create!(permitted_params(Channel::Whatsapp::EDITABLE_ATTRS)[:channel].except(:type))
-    end
+    return unless %w[web_widget api email line telegram whatsapp sms].include?(permitted_params[:channel][:type])
+
+    account_channels_method.create!(permitted_params(channel_type_from_params::EDITABLE_ATTRS)[:channel].except(:type))
   end
 
   def update_channel_feature_flags
@@ -123,6 +112,30 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     )
   end
 
+  def channel_type_from_params
+    {
+      'web_widget' => Channel::WebWidget,
+      'api' => Channel::Api,
+      'email' => Channel::Email,
+      'line' => Channel::Line,
+      'telegram' => Channel::Telegram,
+      'whatsapp' => Channel::Whatsapp,
+      'sms' => Channel::Sms
+    }[permitted_params[:channel][:type]]
+  end
+
+  def account_channels_method
+    {
+      'web_widget' => Current.account.web_widgets,
+      'api' => Current.account.api_channels,
+      'email' => Current.account.email_channels,
+      'line' => Current.account.line_channels,
+      'telegram' => Current.account.telegram_channels,
+      'whatsapp' => Current.account.whatsapp_channels,
+      'sms' => Current.account.sms_channels
+    }[permitted_params[:channel][:type]]
+  end
+
   def get_channel_attributes(channel_type)
     if channel_type.constantize.const_defined?('EDITABLE_ATTRS')
       channel_type.constantize::EDITABLE_ATTRS.presence
diff --git a/app/controllers/webhooks/sms_controller.rb b/app/controllers/webhooks/sms_controller.rb
new file mode 100644
index 000000000..914357dc9
--- /dev/null
+++ b/app/controllers/webhooks/sms_controller.rb
@@ -0,0 +1,6 @@
+class Webhooks::SmsController < ActionController::API
+  def process_payload
+    Webhooks::SmsEventsJob.perform_later(params['_json']&.first&.to_unsafe_hash)
+    head :ok
+  end
+end
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 537998ac9..86cf1a3c3 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Phone number",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
 			"WHATSAPP": {
         "TITLE": "WhatsApp Channel",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
index a71744939..e17960d9b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
@@ -247,7 +247,7 @@ export default {
       if (this.isOngoingType) {
         return this.$store.getters['inboxes/getWebsiteInboxes'];
       }
-      return this.$store.getters['inboxes/getTwilioSMSInboxes'];
+      return this.$store.getters['inboxes/getSMSInboxes'];
     },
     sendersAndBotList() {
       return [
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue
index 6405e23dd..19a292e34 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue
@@ -171,7 +171,7 @@ export default {
       if (this.isOngoingType) {
         return this.$store.getters['inboxes/getWebsiteInboxes'];
       }
-      return this.$store.getters['inboxes/getTwilioSMSInboxes'];
+      return this.$store.getters['inboxes/getSMSInboxes'];
     },
     pageTitle() {
       return `${this.$t('CAMPAIGN.EDIT.TITLE')} - ${
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
index 6f0121679..ac8518f16 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
@@ -50,7 +50,7 @@ export default {
         { key: 'facebook', name: 'Messenger' },
         { key: 'twitter', name: 'Twitter' },
         { key: 'whatsapp', name: 'WhatsApp' },
-        { key: 'sms', name: 'SMS via Twilio' },
+        { key: 'sms', name: 'SMS' },
         { key: 'email', name: 'Email' },
         {
           key: 'api',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index 95cbd7646..270c28fc6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -29,6 +29,14 @@
           >
           </woot-code>
         </div>
+        <div class="medium-6 small-offset-3">
+          <woot-code
+            v-if="isASmsInbox"
+            lang="html"
+            :script="currentInbox.callback_webhook_url"
+          >
+          </woot-code>
+        </div>
         <div class="medium-6 small-offset-3">
           <woot-code
             v-if="isAEmailInbox"
@@ -86,6 +94,9 @@ export default {
     isALineInbox() {
       return this.currentInbox.channel_type === 'Channel::Line';
     },
+    isASmsInbox() {
+      return this.currentInbox.channel_type === 'Channel::Sms';
+    },
     message() {
       if (this.isATwilioInbox) {
         return `${this.$t('INBOX_MGMT.FINISH.MESSAGE')}. ${this.$t(
@@ -93,6 +104,12 @@ export default {
         )}`;
       }
 
+      if (this.isASmsInbox) {
+        return `${this.$t('INBOX_MGMT.FINISH.MESSAGE')}. ${this.$t(
+          'INBOX_MGMT.ADD.SMS.BANDWIDTH.API_CALLBACK.SUBTITLE'
+        )}`;
+      }
+
       if (this.isALineInbox) {
         return `${this.$t('INBOX_MGMT.FINISH.MESSAGE')}. ${this.$t(
           'INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.SUBTITLE'
@@ -103,10 +120,11 @@ export default {
         return this.$t('INBOX_MGMT.ADD.EMAIL_CHANNEL.FINISH_MESSAGE');
       }
 
-      if (!this.currentInbox.web_widget_script) {
-        return this.$t('INBOX_MGMT.FINISH.MESSAGE');
+      if (this.currentInbox.web_widget_script) {
+        return this.$t('INBOX_MGMT.FINISH.WEBSITE_SUCCESS');
       }
-      return this.$t('INBOX_MGMT.FINISH.WEBSITE_SUCCESS');
+
+      return this.$t('INBOX_MGMT.FINISH.MESSAGE');
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 07edeee15..67ccfc0ef 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -48,6 +48,9 @@
                 <span v-if="item.channel_type === 'Channel::Whatsapp'">
                   Whatsapp
                 </span>
+                <span v-if="item.channel_type === 'Channel::Sms'">
+                  Sms
+                </span>
                 <span v-if="item.channel_type === 'Channel::Email'">
                   Email
                 </span>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BandwidthSms.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BandwidthSms.vue
new file mode 100644
index 000000000..dd531f951
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BandwidthSms.vue
@@ -0,0 +1,181 @@
+<template>
+  <form class="row" @submit.prevent="createChannel()">
+    <div class="medium-8 columns">
+      <label :class="{ error: $v.inboxName.$error }">
+        {{ $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.INBOX_NAME.LABEL') }}
+        <input
+          v-model.trim="inboxName"
+          type="text"
+          :placeholder="
+            $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.INBOX_NAME.PLACEHOLDER')
+          "
+          @blur="$v.inboxName.$touch"
+        />
+        <span v-if="$v.inboxName.$error" class="message">{{
+          $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.INBOX_NAME.ERROR')
+        }}</span>
+      </label>
+    </div>
+
+    <div class="medium-8 columns">
+      <label :class="{ error: $v.phoneNumber.$error }">
+        {{ $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.PHONE_NUMBER.LABEL') }}
+        <input
+          v-model.trim="phoneNumber"
+          type="text"
+          :placeholder="
+            $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.PHONE_NUMBER.PLACEHOLDER')
+          "
+          @blur="$v.phoneNumber.$touch"
+        />
+        <span v-if="$v.phoneNumber.$error" class="message">{{
+          $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.PHONE_NUMBER.ERROR')
+        }}</span>
+      </label>
+    </div>
+
+    <div class="medium-8 columns">
+      <label :class="{ error: $v.accountId.$error }">
+        {{ $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.ACCOUNT_ID.LABEL') }}
+        <input
+          v-model.trim="accountId"
+          type="text"
+          :placeholder="
+            $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.ACCOUNT_ID.PLACEHOLDER')
+          "
+          @blur="$v.accountId.$touch"
+        />
+        <span v-if="$v.accountId.$error" class="message">{{
+          $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.ACCOUNT_ID.ERROR')
+        }}</span>
+      </label>
+    </div>
+
+    <div class="medium-8 columns">
+      <label :class="{ error: $v.applicationId.$error }">
+        {{ $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.APPLICATION_ID.LABEL') }}
+        <input
+          v-model.trim="applicationId"
+          type="text"
+          :placeholder="
+            $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.APPLICATION_ID.PLACEHOLDER')
+          "
+          @blur="$v.applicationId.$touch"
+        />
+        <span v-if="$v.applicationId.$error" class="message">{{
+          $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.APPLICATION_ID.ERROR')
+        }}</span>
+      </label>
+    </div>
+
+    <div class="medium-8 columns">
+      <label :class="{ error: $v.apiKey.$error }">
+        {{ $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.API_KEY.LABEL') }}
+        <input
+          v-model.trim="apiKey"
+          type="text"
+          :placeholder="$t('INBOX_MGMT.ADD.SMS.BANDWIDTH.API_KEY.PLACEHOLDER')"
+          @blur="$v.apiKey.$touch"
+        />
+        <span v-if="$v.apiKey.$error" class="message">{{
+          $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.API_KEY.ERROR')
+        }}</span>
+      </label>
+    </div>
+
+    <div class="medium-8 columns">
+      <label :class="{ error: $v.apiSecret.$error }">
+        {{ $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.API_SECRET.LABEL') }}
+        <input
+          v-model.trim="apiSecret"
+          type="text"
+          :placeholder="
+            $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.API_SECRET.PLACEHOLDER')
+          "
+          @blur="$v.apiSecret.$touch"
+        />
+        <span v-if="$v.apiSecret.$error" class="message">{{
+          $t('INBOX_MGMT.ADD.SMS.BANDWIDTH.API_SECRET.ERROR')
+        }}</span>
+      </label>
+    </div>
+
+    <div class="medium-12 columns">
+      <woot-submit-button
+        :loading="uiFlags.isCreating"
+        :button-text="$t('INBOX_MGMT.ADD.SMS.BANDWIDTH.SUBMIT_BUTTON')"
+      />
+    </div>
+  </form>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import { required } from 'vuelidate/lib/validators';
+import router from '../../../../index';
+
+const shouldStartWithPlusSign = (value = '') => value.startsWith('+');
+
+export default {
+  mixins: [alertMixin],
+  data() {
+    return {
+      accountId: '',
+      apiKey: '',
+      apiSecret: '',
+      applicationId: '',
+      inboxName: '',
+      phoneNumber: '',
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'inboxes/getUIFlags',
+      globalConfig: 'globalConfig/get',
+    }),
+  },
+  validations: {
+    inboxName: { required },
+    phoneNumber: { required, shouldStartWithPlusSign },
+    apiKey: { required },
+    apiSecret: { required },
+    applicationId: { required },
+    accountId: { required },
+  },
+  methods: {
+    async createChannel() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        return;
+      }
+
+      try {
+        const smsChannel = await this.$store.dispatch('inboxes/createChannel', {
+          name: this.inboxName,
+          channel: {
+            type: 'sms',
+            phone_number: this.phoneNumber,
+            provider_config: {
+              api_key: this.apiKey,
+              api_secret: this.apiSecret,
+              application_id: this.applicationId,
+              account_id: this.accountId,
+            },
+          },
+        });
+
+        router.replace({
+          name: 'settings_inboxes_add_agents',
+          params: {
+            page: 'new',
+            inbox_id: smsChannel.id,
+          },
+        });
+      } catch (error) {
+        this.showAlert(this.$t('INBOX_MGMT.ADD.SMS.API.ERROR_MESSAGE'));
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
index cc4d18f1a..b669ad27d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
@@ -4,18 +4,39 @@
       :header-title="$t('INBOX_MGMT.ADD.SMS.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.SMS.DESC')"
     />
-    <twilio type="sms"></twilio>
+    <div class="medium-8 columns">
+      <label>
+        {{ $t('INBOX_MGMT.ADD.SMS.PROVIDERS.LABEL') }}
+        <select v-model="provider">
+          <option value="twilio">
+            {{ $t('INBOX_MGMT.ADD.SMS.PROVIDERS.TWILIO') }}
+          </option>
+          <option value="360dialog">
+            {{ $t('INBOX_MGMT.ADD.SMS.PROVIDERS.BANDWIDTH') }}
+          </option>
+        </select>
+      </label>
+    </div>
+    <twilio v-if="provider === 'twilio'" type="sms"></twilio>
+    <bandwidth-sms v-else />
   </div>
 </template>
 
 <script>
 import PageHeader from '../../SettingsSubPageHeader';
+import BandwidthSms from './BandwidthSms.vue';
 import Twilio from './Twilio';
 
 export default {
   components: {
     PageHeader,
     Twilio,
+    BandwidthSms,
+  },
+  data() {
+    return {
+      provider: 'twilio',
+    };
   },
 };
 </script>
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index e266887f7..a180a5b80 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -78,9 +78,11 @@ export const getters = {
       item => item.channel_type === INBOX_TYPES.TWILIO
     );
   },
-  getTwilioSMSInboxes($state) {
+  getSMSInboxes($state) {
     return $state.records.filter(
-      item => item.channel_type === INBOX_TYPES.TWILIO && item.medium === 'sms'
+      item =>
+        item.channel_type === INBOX_TYPES.SMS ||
+        (item.channel_type === INBOX_TYPES.TWILIO && item.medium === 'sms')
     );
   },
   dialogFlowEnabledInboxes($state) {
diff --git a/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js b/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js
index 9db92b00a..f7b06d232 100644
--- a/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js
@@ -55,4 +55,11 @@ export default [
     website_token: 'randomid125',
     enable_auto_assignment: true,
   },
+  {
+    id: 6,
+    channel_id: 6,
+    name: 'Test Widget 6',
+    channel_type: 'Channel::Sms',
+    provider: 'default',
+  },
 ];
diff --git a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
index 73d6624e0..e8af7dd58 100644
--- a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
@@ -19,14 +19,14 @@ describe('#getters', () => {
     expect(getters.getTwilioInboxes(state).length).toEqual(1);
   });
 
-  it('getTwilioSMSInboxes', () => {
+  it('getSMSInboxes', () => {
     const state = { records: inboxList };
-    expect(getters.getTwilioSMSInboxes(state).length).toEqual(1);
+    expect(getters.getSMSInboxes(state).length).toEqual(2);
   });
 
   it('dialogFlowEnabledInboxes', () => {
     const state = { records: inboxList };
-    expect(getters.dialogFlowEnabledInboxes(state).length).toEqual(5);
+    expect(getters.dialogFlowEnabledInboxes(state).length).toEqual(6);
   });
 
   it('getInbox', () => {
diff --git a/app/javascript/shared/mixins/inboxMixin.js b/app/javascript/shared/mixins/inboxMixin.js
index 022b9327e..aebbeebc1 100644
--- a/app/javascript/shared/mixins/inboxMixin.js
+++ b/app/javascript/shared/mixins/inboxMixin.js
@@ -8,6 +8,7 @@ export const INBOX_TYPES = {
   EMAIL: 'Channel::Email',
   TELEGRAM: 'Channel::Telegram',
   LINE: 'Channel::Line',
+  SMS: 'Channel::Sms',
 };
 
 export default {
diff --git a/app/jobs/send_reply_job.rb b/app/jobs/send_reply_job.rb
index 08597a54d..cef80c9df 100644
--- a/app/jobs/send_reply_job.rb
+++ b/app/jobs/send_reply_job.rb
@@ -6,19 +6,20 @@ class SendReplyJob < ApplicationJob
     conversation = message.conversation
     channel_name = conversation.inbox.channel.class.to_s
 
+    services = {
+      'Channel::TwitterProfile' => ::Twitter::SendOnTwitterService,
+      'Channel::TwilioSms' => ::Twilio::SendOnTwilioService,
+      'Channel::Line' => ::Line::SendOnLineService,
+      'Channel::Telegram' => ::Telegram::SendOnTelegramService,
+      'Channel::Whatsapp' => ::Whatsapp::SendOnWhatsappService,
+      'Channel::Sms' => ::Sms::SendOnSmsService
+    }
+
     case channel_name
     when 'Channel::FacebookPage'
       send_on_facebook_page(message)
-    when 'Channel::TwitterProfile'
-      ::Twitter::SendOnTwitterService.new(message: message).perform
-    when 'Channel::TwilioSms'
-      ::Twilio::SendOnTwilioService.new(message: message).perform
-    when 'Channel::Line'
-      ::Line::SendOnLineService.new(message: message).perform
-    when 'Channel::Telegram'
-      ::Telegram::SendOnTelegramService.new(message: message).perform
-    when 'Channel::Whatsapp'
-      ::Whatsapp::SendOnWhatsappService.new(message: message).perform
+    else
+      services[channel_name].new(message: message).perform if services[channel_name].present?
     end
   end
 
diff --git a/app/jobs/webhooks/sms_events_job.rb b/app/jobs/webhooks/sms_events_job.rb
new file mode 100644
index 000000000..c982e0da1
--- /dev/null
+++ b/app/jobs/webhooks/sms_events_job.rb
@@ -0,0 +1,13 @@
+class Webhooks::SmsEventsJob < ApplicationJob
+  queue_as :default
+
+  def perform(params = {})
+    return unless params[:type] == 'message-received'
+
+    channel = Channel::Sms.find_by(phone_number: params[:to])
+    return unless channel
+
+    # TODO: pass to appropriate provider service from here
+    Sms::IncomingMessageService.new(inbox: channel.inbox, params: params[:message].with_indifferent_access).perform
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 10e022aa4..da0dd062b 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -69,6 +69,7 @@ class Account < ApplicationRecord
   has_many :web_widgets, dependent: :destroy_async, class_name: '::Channel::WebWidget'
   has_many :webhooks, dependent: :destroy_async
   has_many :whatsapp_channels, dependent: :destroy_async, class_name: '::Channel::Whatsapp'
+  has_many :sms_channels, dependent: :destroy_async, class_name: '::Channel::Sms'
   has_many :working_hours, dependent: :destroy_async
   has_many :automation_rules, dependent: :destroy
 
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index a103eb44f..0093342d6 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -58,6 +58,7 @@ class Campaign < ApplicationRecord
     return if completed?
 
     Twilio::OneoffSmsCampaignService.new(campaign: self).perform if inbox.inbox_type == 'Twilio SMS'
+    Sms::OneoffSmsCampaignService.new(campaign: self).perform if inbox.inbox_type == 'Sms'
   end
 
   private
@@ -69,14 +70,14 @@ class Campaign < ApplicationRecord
   def validate_campaign_inbox
     return unless inbox
 
-    errors.add :inbox, 'Unsupported Inbox type' unless ['Website', 'Twilio SMS'].include? inbox.inbox_type
+    errors.add :inbox, 'Unsupported Inbox type' unless ['Website', 'Twilio SMS', 'Sms'].include? inbox.inbox_type
   end
 
   # TO-DO we clean up with better validations when campaigns evolve into more inboxes
   def ensure_correct_campaign_attributes
     return if inbox.blank?
 
-    if inbox.inbox_type == 'Twilio SMS'
+    if ['Twilio SMS', 'Sms'].include?(inbox.inbox_type)
       self.campaign_type = 'one_off'
       self.scheduled_at ||= Time.now.utc
     else
diff --git a/app/models/channel/sms.rb b/app/models/channel/sms.rb
new file mode 100644
index 000000000..ff7dd2433
--- /dev/null
+++ b/app/models/channel/sms.rb
@@ -0,0 +1,81 @@
+# == Schema Information
+#
+# Table name: channel_sms
+#
+#  id              :bigint           not null, primary key
+#  phone_number    :string           not null
+#  provider        :string           default("default")
+#  provider_config :jsonb
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  account_id      :integer          not null
+#
+# Indexes
+#
+#  index_channel_sms_on_phone_number  (phone_number) UNIQUE
+#
+
+class Channel::Sms < ApplicationRecord
+  include Channelable
+
+  self.table_name = 'channel_sms'
+  EDITABLE_ATTRS = [:phone_number, { provider_config: {} }].freeze
+
+  validates :phone_number, presence: true, uniqueness: true
+  # before_save :validate_provider_config
+
+  def name
+    'Sms'
+  end
+
+  # all this should happen in provider service . but hack mode on
+  def api_base_path
+    'https://messaging.bandwidth.com/api/v2'
+  end
+
+  # Extract later into provider Service
+  def send_message(phone_number, message)
+    if message.attachments.present?
+      send_attachment_message(phone_number, message)
+    else
+      send_text_message(phone_number, message.content)
+    end
+  end
+
+  def send_text_message(contact_number, message)
+    response = HTTParty.post(
+      "#{api_base_path}/users/#{provider_config['account_id']}/messages",
+      basic_auth: bandwidth_auth,
+      headers: { 'Content-Type' => 'application/json' },
+      body: {
+        'to' => contact_number,
+        'from' => phone_number,
+        'text' => message,
+        'applicationId' => provider_config['application_id']
+      }.to_json
+    )
+
+    response.success? ? response.parsed_response['id'] : nil
+  end
+
+  private
+
+  def send_attachment_message(phone_number, message)
+    # fix me
+  end
+
+  def bandwidth_auth
+    { username: provider_config['api_key'], password: provider_config['api_secret'] }
+  end
+
+  # Extract later into provider Service
+  # let's revisit later
+  def validate_provider_config
+    response = HTTParty.post(
+      "#{api_base_path}/users/#{provider_config['account_id']}/messages",
+      basic_auth: bandwidth_auth,
+      headers: { 'Content-Type': 'application/json' }
+    )
+    errors.add(:provider_config, 'error setting up') unless response.success?
+  end
+end
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 3642fac16..9349735fc 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -149,6 +149,6 @@ class Channel::Whatsapp < ApplicationRecord
         url: "#{ENV['FRONTEND_URL']}/webhooks/whatsapp/#{phone_number}"
       }.to_json
     )
-    errors.add(:bot_token, 'error setting up the webook') unless response.success?
+    errors.add(:provider_config, 'error setting up the webook') unless response.success?
   end
 end
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 774c66f9d..2d7077fa9 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -107,6 +107,8 @@ class Inbox < ApplicationRecord
     case channel_type
     when 'Channel::TwilioSms'
       "#{ENV['FRONTEND_URL']}/twilio/callback"
+    when 'Channel::Sms'
+      "#{ENV['FRONTEND_URL']}/webhooks/sms/#{channel.phone_number.delete_prefix('+')}"
     when 'Channel::Line'
       "#{ENV['FRONTEND_URL']}/webhooks/line/#{channel.line_channel_id}"
     end
diff --git a/app/services/contacts/contactable_inboxes_service.rb b/app/services/contacts/contactable_inboxes_service.rb
index fcd91d4c3..c5cde516f 100644
--- a/app/services/contacts/contactable_inboxes_service.rb
+++ b/app/services/contacts/contactable_inboxes_service.rb
@@ -14,6 +14,8 @@ class Contacts::ContactableInboxesService
       twilio_contactable_inbox(inbox)
     when 'Channel::Whatsapp'
       whatsapp_contactable_inbox(inbox)
+    when 'Channel::Sms'
+      sms_contactable_inbox(inbox)
     when 'Channel::Email'
       email_contactable_inbox(inbox)
     when 'Channel::Api'
@@ -52,6 +54,12 @@ class Contacts::ContactableInboxesService
     { source_id: @contact.phone_number.delete('+'), inbox: inbox }
   end
 
+  def sms_contactable_inbox(inbox)
+    return unless @contact.phone_number
+
+    { source_id: @contact.phone_number, inbox: inbox }
+  end
+
   def twilio_contactable_inbox(inbox)
     return if @contact.phone_number.blank?
 
diff --git a/app/services/sms/incoming_message_service.rb b/app/services/sms/incoming_message_service.rb
new file mode 100644
index 000000000..62fda96ac
--- /dev/null
+++ b/app/services/sms/incoming_message_service.rb
@@ -0,0 +1,66 @@
+class Sms::IncomingMessageService
+  include ::FileTypeHelper
+
+  pattr_initialize [:inbox!, :params!]
+
+  def perform
+    set_contact
+    set_conversation
+    @message = @conversation.messages.create(
+      content: params[:text],
+      account_id: @inbox.account_id,
+      inbox_id: @inbox.id,
+      message_type: :incoming,
+      sender: @contact,
+      source_id: params[:id]
+    )
+  end
+
+  private
+
+  def account
+    @account ||= @inbox.account
+  end
+
+  def phone_number
+    params[:from]
+  end
+
+  def formatted_phone_number
+    TelephoneNumber.parse(phone_number).international_number
+  end
+
+  def set_contact
+    contact_inbox = ::ContactBuilder.new(
+      source_id: params[:from],
+      inbox: @inbox,
+      contact_attributes: contact_attributes
+    ).perform
+
+    @contact_inbox = contact_inbox
+    @contact = contact_inbox.contact
+  end
+
+  def conversation_params
+    {
+      account_id: @inbox.account_id,
+      inbox_id: @inbox.id,
+      contact_id: @contact.id,
+      contact_inbox_id: @contact_inbox.id
+    }
+  end
+
+  def set_conversation
+    @conversation = @contact_inbox.conversations.first
+    return if @conversation
+
+    @conversation = ::Conversation.create!(conversation_params)
+  end
+
+  def contact_attributes
+    {
+      name: formatted_phone_number,
+      phone_number: phone_number
+    }
+  end
+end
diff --git a/app/services/sms/oneoff_sms_campaign_service.rb b/app/services/sms/oneoff_sms_campaign_service.rb
new file mode 100644
index 000000000..73a101d24
--- /dev/null
+++ b/app/services/sms/oneoff_sms_campaign_service.rb
@@ -0,0 +1,32 @@
+class Sms::OneoffSmsCampaignService
+  pattr_initialize [:campaign!]
+
+  def perform
+    raise "Invalid campaign #{campaign.id}" if campaign.inbox.inbox_type != 'Sms' || !campaign.one_off?
+    raise 'Completed Campaign' if campaign.completed?
+
+    # marks campaign completed so that other jobs won't pick it up
+    campaign.completed!
+
+    audience_label_ids = campaign.audience.select { |audience| audience['type'] == 'Label' }.pluck('id')
+    audience_labels = campaign.account.labels.where(id: audience_label_ids).pluck(:title)
+    process_audience(audience_labels)
+  end
+
+  private
+
+  delegate :inbox, to: :campaign
+  delegate :channel, to: :inbox
+
+  def process_audience(audience_labels)
+    campaign.account.contacts.tagged_with(audience_labels, any: true).each do |contact|
+      next if contact.phone_number.blank?
+
+      send_message(to: contact.phone_number, content: campaign.message)
+    end
+  end
+
+  def send_message(to:, content:)
+    channel.send_text_message(to, content)
+  end
+end
diff --git a/app/services/sms/send_on_sms_service.rb b/app/services/sms/send_on_sms_service.rb
new file mode 100644
index 000000000..ccfede28c
--- /dev/null
+++ b/app/services/sms/send_on_sms_service.rb
@@ -0,0 +1,16 @@
+class Sms::SendOnSmsService < Base::SendOnChannelService
+  private
+
+  def channel_class
+    Channel::Sms
+  end
+
+  def perform_reply
+    send_on_sms
+  end
+
+  def send_on_sms
+    message_id = channel.send_message(message.conversation.contact_inbox.source_id, message)
+    message.update!(source_id: message_id) if message_id.present?
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 49e7bf059..f90b6b84b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -271,6 +271,7 @@ Rails.application.routes.draw do
   post 'webhooks/line/:line_channel_id', to: 'webhooks/line#process_payload'
   post 'webhooks/telegram/:bot_token', to: 'webhooks/telegram#process_payload'
   post 'webhooks/whatsapp/:phone_number', to: 'webhooks/whatsapp#process_payload'
+  post 'webhooks/sms/:phone_number', to: 'webhooks/sms#process_payload'
   get 'webhooks/instagram', to: 'webhooks/instagram#verify'
   post 'webhooks/instagram', to: 'webhooks/instagram#events'
 
diff --git a/db/migrate/20220129024443_add_sms_channel.rb b/db/migrate/20220129024443_add_sms_channel.rb
new file mode 100644
index 000000000..c65019f7e
--- /dev/null
+++ b/db/migrate/20220129024443_add_sms_channel.rb
@@ -0,0 +1,11 @@
+class AddSmsChannel < ActiveRecord::Migration[6.1]
+  def change
+    create_table :channel_sms do |t|
+      t.integer :account_id, null: false
+      t.string :phone_number, null: false, index: { unique: true }
+      t.string :provider, default: 'default'
+      t.jsonb :provider_config, default: {}
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 27da2435d..081dbdc3a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -228,6 +228,16 @@ ActiveRecord::Schema.define(version: 2022_01_31_081750) do
     t.index ["line_channel_id"], name: "index_channel_line_on_line_channel_id", unique: true
   end
 
+  create_table "channel_sms", force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.string "phone_number", null: false
+    t.string "provider", default: "default"
+    t.jsonb "provider_config", default: {}
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["phone_number"], name: "index_channel_sms_on_phone_number", unique: true
+  end
+
   create_table "channel_telegram", force: :cascade do |t|
     t.string "bot_name"
     t.integer "account_id", null: false
diff --git a/spec/builders/contact_inbox_builder_spec.rb b/spec/builders/contact_inbox_builder_spec.rb
index 40f19aba1..80658b5ac 100644
--- a/spec/builders/contact_inbox_builder_spec.rb
+++ b/spec/builders/contact_inbox_builder_spec.rb
@@ -99,6 +99,53 @@ describe ::ContactInboxBuilder do
       end
     end
 
+    describe 'sms inbox' do
+      let!(:sms_channel) { create(:channel_sms, account: account) }
+      let!(:sms_inbox) { create(:inbox, channel: sms_channel, account: account) }
+
+      it 'does not create contact inbox when contact inbox already exists with the source id provided' do
+        existing_contact_inbox = create(:contact_inbox, contact: contact, inbox: sms_inbox, source_id: contact.phone_number)
+        contact_inbox = described_class.new(
+          contact_id: contact.id,
+          inbox_id: sms_inbox.id,
+          source_id: contact.phone_number
+        ).perform
+
+        expect(contact_inbox.id).to be(existing_contact_inbox.id)
+      end
+
+      it 'does not create contact inbox when contact inbox already exists with phone number and source id is not provided' do
+        existing_contact_inbox = create(:contact_inbox, contact: contact, inbox: sms_inbox, source_id: contact.phone_number)
+        contact_inbox = described_class.new(
+          contact_id: contact.id,
+          inbox_id: sms_inbox.id
+        ).perform
+
+        expect(contact_inbox.id).to be(existing_contact_inbox.id)
+      end
+
+      it 'creates a new contact inbox when different source id is provided' do
+        existing_contact_inbox = create(:contact_inbox, contact: contact, inbox: sms_inbox, source_id: contact.phone_number)
+        contact_inbox = described_class.new(
+          contact_id: contact.id,
+          inbox_id: sms_inbox.id,
+          source_id: '+224213223422'
+        ).perform
+
+        expect(contact_inbox.id).not_to be(existing_contact_inbox.id)
+        expect(contact_inbox.source_id).not_to be('+224213223422')
+      end
+
+      it 'creates a contact inbox with contact phone number when source id not provided and no contact inbox exists' do
+        contact_inbox = described_class.new(
+          contact_id: contact.id,
+          inbox_id: sms_inbox.id
+        ).perform
+
+        expect(contact_inbox.source_id).not_to be(contact.phone_number)
+      end
+    end
+
     describe 'email inbox' do
       let!(:email_channel) { create(:channel_email, account: account) }
       let!(:email_inbox) { create(:inbox, channel: email_channel, account: account) }
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 1c7082abc..8ccf667ac 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -309,6 +309,18 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(response.body).to include('callback_webhook_url')
       end
 
+      it 'creates a sms inbox when administrator' do
+        post "/api/v1/accounts/#{account.id}/inboxes",
+             headers: admin.create_new_auth_token,
+             params: { name: 'Sms Inbox',
+                       channel: { type: 'sms', phone_number: '+123456789', provider_config: { test: 'test' } } },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include('Sms Inbox')
+        expect(response.body).to include('+123456789')
+      end
+
       it 'creates the webwidget inbox that allow messages after conversation is resolved' do
         post "/api/v1/accounts/#{account.id}/inboxes",
              headers: admin.create_new_auth_token,
diff --git a/spec/controllers/webhooks/sms_controller_spec.rb b/spec/controllers/webhooks/sms_controller_spec.rb
new file mode 100644
index 000000000..0ce9bb94d
--- /dev/null
+++ b/spec/controllers/webhooks/sms_controller_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe 'Webhooks::SmsController', type: :request do
+  describe 'POST /webhooks/sms/{:phone_number}' do
+    it 'call the sms events job with the params' do
+      allow(Webhooks::SmsEventsJob).to receive(:perform_later)
+      expect(Webhooks::SmsEventsJob).to receive(:perform_later)
+      post '/webhooks/sms/123221321', params: { content: 'hello' }
+      expect(response).to have_http_status(:success)
+    end
+  end
+end
diff --git a/spec/factories/channel/channel_sms.rb b/spec/factories/channel/channel_sms.rb
new file mode 100644
index 000000000..3eb5b499a
--- /dev/null
+++ b/spec/factories/channel/channel_sms.rb
@@ -0,0 +1,16 @@
+FactoryBot.define do
+  factory :channel_sms, class: 'Channel::Sms' do
+    sequence(:phone_number) { |n| "+123456789#{n}1" }
+    account
+    provider_config do
+      { 'account_id' => '1',
+        'application_id' => '1',
+        'api_key' => '1',
+        'api_secret' => '1' }
+    end
+
+    after(:create) do |channel_sms|
+      create(:inbox, channel: channel_sms, account: channel_sms.account)
+    end
+  end
+end
diff --git a/spec/jobs/send_reply_job_spec.rb b/spec/jobs/send_reply_job_spec.rb
index 6954bb3c3..03b249368 100644
--- a/spec/jobs/send_reply_job_spec.rb
+++ b/spec/jobs/send_reply_job_spec.rb
@@ -75,5 +75,14 @@ RSpec.describe SendReplyJob, type: :job do
       expect(process_service).to receive(:perform)
       described_class.perform_now(message.id)
     end
+
+    it 'calls ::Sms::SendOnSmsService when its sms message' do
+      sms_channel = create(:channel_sms)
+      message = create(:message, conversation: create(:conversation, inbox: sms_channel.inbox))
+      allow(::Sms::SendOnSmsService).to receive(:new).with(message: message).and_return(process_service)
+      expect(::Sms::SendOnSmsService).to receive(:new).with(message: message)
+      expect(process_service).to receive(:perform)
+      described_class.perform_now(message.id)
+    end
   end
 end
diff --git a/spec/jobs/webhooks/sms_events_job_spec.rb b/spec/jobs/webhooks/sms_events_job_spec.rb
new file mode 100644
index 000000000..927e8adaa
--- /dev/null
+++ b/spec/jobs/webhooks/sms_events_job_spec.rb
@@ -0,0 +1,56 @@
+require 'rails_helper'
+
+RSpec.describe Webhooks::SmsEventsJob, type: :job do
+  subject(:job) { described_class.perform_later(params) }
+
+  let!(:sms_channel) { create(:channel_sms) }
+  let!(:params) do
+    {
+      time: '2022-02-02T23:14:05.309Z',
+      type: 'message-received',
+      to: sms_channel.phone_number,
+      description: 'Incoming message received',
+      message: {
+        'id': '3232420-2323-234324',
+        'owner': sms_channel.phone_number,
+        'applicationId': '2342349-324234d-32432432',
+        'time': '2022-02-02T23:14:05.262Z',
+        'segmentCount': 1,
+        'direction': 'in',
+        'to': [
+          sms_channel.phone_number
+        ],
+        'from': '+14234234234',
+        'text': 'test message'
+      }
+    }
+  end
+
+  it 'enqueues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .with(params)
+      .on_queue('default')
+  end
+
+  context 'when invalid params' do
+    it 'returns nil when no bot_token' do
+      expect(described_class.perform_now({})).to be_nil
+    end
+
+    it 'returns nil when invalid type' do
+      expect(described_class.perform_now({ type: 'invalid' })).to be_nil
+    end
+  end
+
+  context 'when valid params' do
+    it 'calls Sms::IncomingMessageService' do
+      process_service = double
+      allow(Sms::IncomingMessageService).to receive(:new).and_return(process_service)
+      allow(process_service).to receive(:perform)
+      expect(Sms::IncomingMessageService).to receive(:new).with(inbox: sms_channel.inbox,
+                                                                params: params[:message].with_indifferent_access)
+      expect(process_service).to receive(:perform)
+      described_class.perform_now(params)
+    end
+  end
+end
diff --git a/spec/models/campaign_spec.rb b/spec/models/campaign_spec.rb
index 4ea07cd75..54936ac2b 100644
--- a/spec/models/campaign_spec.rb
+++ b/spec/models/campaign_spec.rb
@@ -78,6 +78,27 @@ RSpec.describe Campaign, type: :model do
       end
     end
 
+    context 'when SMS campaign' do
+      let!(:sms_channel) { create(:channel_sms) }
+      let!(:sms_inbox) { create(:inbox, channel: sms_channel) }
+      let(:campaign) { build(:campaign, inbox: sms_inbox) }
+
+      it 'only saves campaign type as oneoff and wont leave scheduled_at empty' do
+        campaign.campaign_type = 'ongoing'
+        campaign.save!
+        expect(campaign.reload.campaign_type).to eq 'one_off'
+        expect(campaign.scheduled_at.present?).to eq true
+      end
+
+      it 'calls sms service on trigger!' do
+        sms_service = double
+        expect(Sms::OneoffSmsCampaignService).to receive(:new).with(campaign: campaign).and_return(sms_service)
+        expect(sms_service).to receive(:perform)
+        campaign.save!
+        campaign.trigger!
+      end
+    end
+
     context 'when Website campaign' do
       let(:campaign) { build(:campaign) }
 
diff --git a/spec/services/contacts/contactable_inboxes_service_spec.rb b/spec/services/contacts/contactable_inboxes_service_spec.rb
index 860771fbe..3efc00b1a 100644
--- a/spec/services/contacts/contactable_inboxes_service_spec.rb
+++ b/spec/services/contacts/contactable_inboxes_service_spec.rb
@@ -15,8 +15,8 @@ describe Contacts::ContactableInboxesService do
   let!(:email_inbox) { create(:inbox, channel: email_channel, account: account) }
   let!(:api_channel) { create(:channel_api, account: account) }
   let!(:api_inbox) { create(:inbox, channel: api_channel, account: account) }
-  let!(:website_channel) { create(:channel_widget, account: account) }
-  let!(:website_inbox) { create(:inbox, channel: website_channel, account: account) }
+  let!(:website_inbox) { create(:inbox, channel: create(:channel_widget, account: account), account: account) }
+  let!(:sms_inbox) { create(:inbox, channel: create(:channel_sms, account: account), account: account) }
 
   describe '#get' do
     it 'returns the contactable inboxes for the contact' do
@@ -25,7 +25,7 @@ describe Contacts::ContactableInboxesService do
       expect(contactable_inboxes).to include({ source_id: contact.phone_number, inbox: twilio_sms_inbox })
       expect(contactable_inboxes).to include({ source_id: "whatsapp:#{contact.phone_number}", inbox: twilio_whatsapp_inbox })
       expect(contactable_inboxes).to include({ source_id: contact.email, inbox: email_inbox })
-      expect(contactable_inboxes.pluck(:inbox)).to include(api_inbox)
+      expect(contactable_inboxes).to include({ source_id: contact.phone_number, inbox: sms_inbox })
     end
 
     it 'doest not return the non contactable inboxes for the contact' do
diff --git a/spec/services/sms/incoming_message_service_spec.rb b/spec/services/sms/incoming_message_service_spec.rb
new file mode 100644
index 000000000..1e86d8015
--- /dev/null
+++ b/spec/services/sms/incoming_message_service_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe Sms::IncomingMessageService do
+  describe '#perform' do
+    let!(:sms_channel) { create(:channel_sms) }
+
+    context 'when valid text message params' do
+      it 'creates appropriate conversations, message and contacts' do
+        params =  {
+
+          'id': '3232420-2323-234324',
+          'owner': sms_channel.phone_number,
+          'applicationId': '2342349-324234d-32432432',
+          'time': '2022-02-02T23:14:05.262Z',
+          'segmentCount': 1,
+          'direction': 'in',
+          'to': [
+            sms_channel.phone_number
+          ],
+          'from': '+14234234234',
+          'text': 'test message'
+
+        }.with_indifferent_access
+        described_class.new(inbox: sms_channel.inbox, params: params).perform
+        expect(sms_channel.inbox.conversations.count).not_to eq(0)
+        expect(Contact.all.first.name).to eq('+1 423-423-4234')
+        expect(sms_channel.inbox.messages.first.content).to eq('test message')
+      end
+    end
+  end
+end
diff --git a/spec/services/sms/oneoff_sms_campaign_service_spec.rb b/spec/services/sms/oneoff_sms_campaign_service_spec.rb
new file mode 100644
index 000000000..9049175d8
--- /dev/null
+++ b/spec/services/sms/oneoff_sms_campaign_service_spec.rb
@@ -0,0 +1,47 @@
+require 'rails_helper'
+
+describe Sms::OneoffSmsCampaignService do
+  subject(:sms_campaign_service) { described_class.new(campaign: campaign) }
+
+  let(:account) { create(:account) }
+  let!(:sms_channel) { create(:channel_sms) }
+  let!(:sms_inbox) { create(:inbox, channel: sms_channel) }
+  let(:label1) { create(:label, account: account) }
+  let(:label2) { create(:label, account: account) }
+  let!(:campaign) do
+    create(:campaign, inbox: sms_inbox, account: account,
+                      audience: [{ type: 'Label', id: label1.id }, { type: 'Label', id: label2.id }])
+  end
+
+  describe 'perform' do
+    before do
+      stub_request(:post, 'https://messaging.bandwidth.com/api/v2/users/1/messages').to_return(
+        status: 200,
+        body: { 'id' => '1' }.to_json,
+        headers: {}
+      )
+    end
+
+    it 'raises error if the campaign is completed' do
+      campaign.completed!
+
+      expect { sms_campaign_service.perform }.to raise_error 'Completed Campaign'
+    end
+
+    it 'raises error invalid campaign when its not a oneoff sms campaign' do
+      campaign = create(:campaign)
+
+      expect { described_class.new(campaign: campaign).perform }.to raise_error "Invalid campaign #{campaign.id}"
+    end
+
+    it 'send messages to contacts in the audience and marks the campaign completed' do
+      contact_with_label1, contact_with_label2, contact_with_both_labels = FactoryBot.create_list(:contact, 3, :with_phone_number, account: account)
+      contact_with_label1.update_labels([label1.title])
+      contact_with_label2.update_labels([label2.title])
+      contact_with_both_labels.update_labels([label1.title, label2.title])
+      sms_campaign_service.perform
+      assert_requested(:post, 'https://messaging.bandwidth.com/api/v2/users/1/messages', times: 3)
+      expect(campaign.reload.completed?).to eq true
+    end
+  end
+end
diff --git a/spec/services/sms/send_on_sms_service_spec.rb b/spec/services/sms/send_on_sms_service_spec.rb
new file mode 100644
index 000000000..7304fad88
--- /dev/null
+++ b/spec/services/sms/send_on_sms_service_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+describe Sms::SendOnSmsService do
+  describe '#perform' do
+    context 'when a valid message' do
+      let(:sms_request) { double }
+      let!(:sms_channel) { create(:channel_sms) }
+      let!(:contact_inbox) { create(:contact_inbox, inbox: sms_channel.inbox, source_id: '+123456789') }
+      let!(:conversation) { create(:conversation, contact_inbox: contact_inbox, inbox: sms_channel.inbox) }
+
+      it 'calls channel.send_message' do
+        message = create(:message, message_type: :outgoing, content: 'test',
+                                   conversation: conversation)
+        allow(HTTParty).to receive(:post).and_return(sms_request)
+        allow(sms_request).to receive(:success?).and_return(true)
+        allow(sms_request).to receive(:parsed_response).and_return({ 'id' => '123456789' })
+        expect(HTTParty).to receive(:post).with(
+          'https://messaging.bandwidth.com/api/v2/users/1/messages',
+          basic_auth: { username: '1', password: '1' },
+          headers: { 'Content-Type' => 'application/json' },
+          body: { 'to' => '+123456789', 'from' => sms_channel.phone_number, 'text' => 'test', 'applicationId' => '1' }.to_json
+        )
+        described_class.new(message: message).perform
+        expect(message.reload.source_id).to eq('123456789')
+      end
+    end
+  end
+end

From 9454c6b14f75e778ef98cf84bdafdf0ed8ae5705 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 3 Feb 2022 18:25:28 -0800
Subject: [PATCH 058/101] Fix: Conversation filter permissions (#3908)

fixes: chatwoot/product#225
---
 app/finders/conversation_finder.rb       |  2 +-
 spec/finders/conversation_finder_spec.rb | 28 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 3409a2450..58013f128 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -55,7 +55,7 @@ class ConversationFinder
 
   def set_inboxes
     @inbox_ids = if params[:inbox_id]
-                   current_account.inboxes.where(id: params[:inbox_id])
+                   @current_user.assigned_inboxes.where(id: params[:inbox_id])
                  else
                    @current_user.assigned_inboxes.pluck(:id)
                  end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 67b526b64..906c0e3f2 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -6,7 +6,9 @@ describe ::ConversationFinder do
   let!(:account) { create(:account) }
   let!(:user_1) { create(:user, account: account) }
   let!(:user_2) { create(:user, account: account) }
+  let!(:admin) { create(:user, account: account, role: :administrator) }
   let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
+  let!(:restricted_inbox) { create(:inbox, account: account) }
 
   before do
     create(:inbox_member, user: user_1, inbox: inbox)
@@ -30,6 +32,32 @@ describe ::ConversationFinder do
       end
     end
 
+    context 'with inbox' do
+      let!(:restricted_conversation) { create(:conversation, account: account, inbox_id: restricted_inbox.id) }
+
+      it 'returns conversation from any inbox if its admin' do
+        params = { inbox_id: restricted_inbox.id }
+        result = described_class.new(admin, params).perform
+
+        expect(result[:conversations].map(&:id)).to include(restricted_conversation.id)
+      end
+
+      it 'returns conversation from inbox if agent is its member' do
+        params = { inbox_id: restricted_inbox.id }
+        create(:inbox_member, user: user_1, inbox: restricted_inbox)
+        result = described_class.new(user_1, params).perform
+
+        expect(result[:conversations].map(&:id)).to include(restricted_conversation.id)
+      end
+
+      it 'does not return conversations from inboxes where agent is not a member' do
+        params = { inbox_id: restricted_inbox.id }
+        result = described_class.new(user_1, params).perform
+
+        expect(result[:conversations].map(&:id)).not_to include(restricted_conversation.id)
+      end
+    end
+
     context 'with assignee_type all' do
       let(:params) { { assignee_type: 'all' } }
 

From 32673ea8b402fafb8a15c8639b11bc972b1b92dd Mon Sep 17 00:00:00 2001
From: Sagar <sagararyal@users.noreply.github.com>
Date: Fri, 4 Feb 2022 05:28:53 +0100
Subject: [PATCH 059/101] chore: Allow Self Hosted Instances to use Support
 Inbox within Dashboard for Agents (#3907)

---
 app/views/layouts/vueapp.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index d20de94a7..f7d7155d1 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -67,7 +67,7 @@
     <script>
       window.chatwootSettings = { hideMessageBubble: true, position: 'left' };
       (function(d,t) {
-        var BASE_URL="https://app.chatwoot.com";
+        var BASE_URL='<%= ENV.fetch('FRONTEND_URL', 'https://app.chatwoot.com') %>';
         var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
         g.src=BASE_URL+"/packs/js/sdk.js"; g.defer=true; g.async=true;
         s.parentNode.insertBefore(g,s);

From a7987d4d1cdf26a6913d2f123aafb83227037964 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 4 Feb 2022 13:14:20 +0530
Subject: [PATCH 060/101] feat: Add date custom filter (#3892)

---
 app/services/contacts/filter_service.rb       |   2 +
 app/services/conversations/filter_service.rb  |   2 +
 app/services/filter_service.rb                |   9 ++
 lib/filters/filter_keys.json                  |  28 ++++
 spec/services/contacts/filter_service_spec.rb |  78 ++++++++++
 .../conversations/filter_service_spec.rb      | 137 ++++++++++++++++--
 6 files changed, 247 insertions(+), 9 deletions(-)

diff --git a/app/services/contacts/filter_service.rb b/app/services/contacts/filter_service.rb
index aaa7412d4..81946435e 100644
--- a/app/services/contacts/filter_service.rb
+++ b/app/services/contacts/filter_service.rb
@@ -31,6 +31,8 @@ class Contacts::FilterService < FilterService
     case current_filter['attribute_type']
     when 'additional_attributes'
       "  LOWER(contacts.additional_attributes ->> '#{attribute_key}') #{filter_operator_value} #{query_operator} "
+    when 'date_attributes'
+      " (contacts.#{attribute_key})::#{current_filter['data_type']} #{filter_operator_value}#{current_filter['data_type']} #{query_operator} "
     when 'standard'
       if attribute_key == 'labels'
         " tags.id #{filter_operator_value} #{query_operator} "
diff --git a/app/services/conversations/filter_service.rb b/app/services/conversations/filter_service.rb
index 6e73ae9b8..a5773a228 100644
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -37,6 +37,8 @@ class Conversations::FilterService < FilterService
     case current_filter['attribute_type']
     when 'additional_attributes'
       " conversations.additional_attributes ->> '#{attribute_key}' #{filter_operator_value} #{query_operator} "
+    when 'date_attributes'
+      " (conversations.#{attribute_key})::#{current_filter['data_type']} #{filter_operator_value}#{current_filter['data_type']} #{query_operator} "
     when 'standard'
       if attribute_key == 'labels'
         " tags.name #{filter_operator_value} #{query_operator} "
diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb
index a08fb947a..bf2d7d6a0 100644
--- a/app/services/filter_service.rb
+++ b/app/services/filter_service.rb
@@ -36,6 +36,8 @@ class FilterService
       @filter_values["value_#{current_index}"] = 'IS NULL'
     when 'is_greater_than', 'is_less_than'
       @filter_values["value_#{current_index}"] = lt_gt_filter_values(query_hash)
+    when 'days_before'
+      @filter_values["value_#{current_index}"] = days_before_filter_values(query_hash)
     else
       @filter_values["value_#{current_index}"] = filter_values(query_hash).to_s
       "= :value_#{current_index}"
@@ -64,6 +66,13 @@ class FilterService
     "#{operator} '#{value}'::#{attribute_data_type}"
   end
 
+  def days_before_filter_values(query_hash)
+    date = Time.zone.today - query_hash['values'][0].to_i.days
+    query_hash['values'] = [date.strftime]
+    query_hash['filter_operator'] = 'is_less_than'
+    lt_gt_filter_values(query_hash)
+  end
+
   def set_count_for_all_conversations
     [
       @conversations.assigned_to(@user).count,
diff --git a/lib/filters/filter_keys.json b/lib/filters/filter_keys.json
index 2aa5fdab1..2736473b7 100644
--- a/lib/filters/filter_keys.json
+++ b/lib/filters/filter_keys.json
@@ -76,6 +76,20 @@
       "data_type": "link",
       "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
       "attribute_type": "additional_attributes"
+    },
+    "created_at": {
+      "attribute_name": "Created At",
+      "input_type": "date",
+      "data_type": "date",
+      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
+      "attribute_type": "date_attributes"
+    },
+    "last_activity_at": {
+      "attribute_name": "Created At",
+      "input_type": "date",
+      "data_type": "date",
+      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
+      "attribute_type": "date_attributes"
     }
   },
   "contacts": {
@@ -134,6 +148,20 @@
       "data_type": "text",
       "filter_operators": ["exactly_equal_to", "contains", "does_not_contain" ],
       "attribute_type": "standard"
+    },
+    "created_at": {
+      "attribute_name": "Created At",
+      "input_type": "date",
+      "data_type": "date",
+      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
+      "attribute_type": "date_attributes"
+    },
+    "last_activity_at": {
+      "attribute_name": "Created At",
+      "input_type": "date",
+      "data_type": "date",
+      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
+      "attribute_type": "date_attributes"
     }
   },
   "messages": {
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index f52a6c934..e4a05946a 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -141,6 +141,84 @@ describe ::Contacts::FilterService do
         expect(result[:contacts].length).to be 1
         expect(result[:contacts].first.id).to eq(el_contact.id)
       end
+
+      it 'filter by created_at and custom_attributes' do
+        tomorrow = Date.tomorrow.strftime
+        params[:payload] = [
+          {
+            attribute_key: 'customer_type',
+            filter_operator: 'equal_to',
+            values: ['platinum'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'created_at',
+            filter_operator: 'is_less_than',
+            values: [tomorrow.to_s],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expected_count = Contact.where("created_at < ? AND custom_attributes->>'customer_type' = ?", Date.tomorrow, 'platinum').count
+
+        expect(result[:contacts].length).to be expected_count
+        expect(result[:contacts].first.id).to eq(el_contact.id)
+      end
+
+      context 'with x_days_before filter' do
+        before do
+          el_contact.update(last_activity_at: (Time.zone.today - 4.days))
+          cs_contact.update(last_activity_at: (Time.zone.today - 5.days))
+          en_contact.update(last_activity_at: (Time.zone.today - 2.days))
+        end
+
+        it 'filter by last_activity_at 3_days_before and custom_attributes' do
+          params[:payload] = [
+            {
+              attribute_key: 'last_activity_at',
+              filter_operator: 'days_before',
+              values: [3],
+              query_operator: 'AND'
+            }.with_indifferent_access,
+            {
+              attribute_key: 'contact_additional_information',
+              filter_operator: 'equal_to',
+              values: ['test custom data'],
+              query_operator: nil
+            }.with_indifferent_access
+          ]
+
+          expected_count = Contact.where(
+            "last_activity_at < ? AND
+            custom_attributes->>'contact_additional_information' = ?",
+            (Time.zone.today - 3.days),
+            'test custom data'
+          ).count
+
+          result = filter_service.new(params, user_1).perform
+          expect(result[:contacts].length).to be expected_count
+          expect(result[:contacts].first.id).to eq(el_contact.id)
+        end
+
+        it 'filter by last_activity_at 2_days_before and custom_attributes' do
+          params[:payload] = [
+            {
+              attribute_key: 'last_activity_at',
+              filter_operator: 'days_before',
+              values: [2],
+              query_operator: nil
+            }.with_indifferent_access
+          ]
+
+          expected_count = Contact.where('last_activity_at < ?', (Time.zone.today - 2.days)).count
+
+          result = filter_service.new(params, user_1).perform
+          expect(result[:contacts].length).to be expected_count
+          expect(result[:contacts].pluck(:id)).to include(el_contact.id)
+          expect(result[:contacts].pluck(:id)).to include(cs_contact.id)
+          expect(result[:contacts].pluck(:id)).not_to include(en_contact.id)
+        end
+      end
     end
   end
 end
diff --git a/spec/services/conversations/filter_service_spec.rb b/spec/services/conversations/filter_service_spec.rb
index c199cd3e2..693bcf2a9 100644
--- a/spec/services/conversations/filter_service_spec.rb
+++ b/spec/services/conversations/filter_service_spec.rb
@@ -136,24 +136,35 @@ describe ::Conversations::FilterService do
   describe '#perform on custom attribute' do
     context 'with query present' do
       let!(:params) { { payload: [], page: 1 } }
-      let(:payload) do
-        [
+
+      it 'filter by custom_attributes and labels' do
+        user_2_assigned_conversation.update_labels('support')
+        params[:payload] = [
           {
-            attribute_key: 'browser_language',
-            filter_operator: 'contains',
-            values: 'en',
+            attribute_key: 'conversation_type',
+            filter_operator: 'equal_to',
+            values: ['platinum'],
             query_operator: 'AND'
           }.with_indifferent_access,
           {
-            attribute_key: 'status',
-            filter_operator: 'not_equal_to',
-            values: %w[resolved],
+            attribute_key: 'conversation_created',
+            filter_operator: 'is_less_than',
+            values: ['2022-01-20'],
+            query_operator: 'OR'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'labels',
+            filter_operator: 'equal_to',
+            values: ['support'],
             query_operator: nil
           }.with_indifferent_access
         ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:conversations].length).to be 1
+        expect(result[:conversations][0][:id]).to be user_2_assigned_conversation.id
       end
 
-      it 'filter by custom_attributes and labels' do
+      it 'filter by custom_attributes' do
         params[:payload] = [
           {
             attribute_key: 'conversation_type',
@@ -171,6 +182,114 @@ describe ::Conversations::FilterService do
         result = filter_service.new(params, user_1).perform
         expect(result[:conversations].length).to be 1
       end
+
+      it 'filter by custom_attributes and additional_attributes' do
+        params[:payload] = [
+          {
+            attribute_key: 'conversation_type',
+            filter_operator: 'equal_to',
+            values: ['platinum'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'browser_language',
+            filter_operator: 'is_equal_to',
+            values: 'en',
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:conversations].length).to be 1
+      end
+    end
+  end
+
+  describe '#perform on date filter' do
+    context 'with query present' do
+      let!(:params) { { payload: [], page: 1 } }
+
+      it 'filter by created_at' do
+        params[:payload] = [
+          {
+            attribute_key: 'created_at',
+            filter_operator: 'is_greater_than',
+            values: ['2022-01-20'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expected_count = Conversation.where('created_at > ?', DateTime.parse('2022-01-20')).count
+        expect(result[:conversations].length).to be expected_count
+      end
+
+      it 'filter by created_at and conversation_type' do
+        params[:payload] = [
+          {
+            attribute_key: 'conversation_type',
+            filter_operator: 'equal_to',
+            values: ['platinum'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'created_at',
+            filter_operator: 'is_greater_than',
+            values: ['2022-01-20'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expected_count = Conversation.where("created_at > ? AND custom_attributes->>'conversation_type' = ?", DateTime.parse('2022-01-20'),
+                                            'platinum').count
+
+        expect(result[:conversations].length).to be expected_count
+      end
+
+      context 'with x_days_before filter' do
+        before do
+          en_conversation_1.update!(last_activity_at: (Time.zone.today - 4.days))
+          en_conversation_2.update!(last_activity_at: (Time.zone.today - 5.days))
+          user_2_assigned_conversation.update!(last_activity_at: (Time.zone.today - 2.days))
+        end
+
+        it 'filter by last_activity_at 3_days_before and custom_attributes' do
+          params[:payload] = [
+            {
+              attribute_key: 'last_activity_at',
+              filter_operator: 'days_before',
+              values: [3],
+              query_operator: 'AND'
+            }.with_indifferent_access,
+            {
+              attribute_key: 'conversation_type',
+              filter_operator: 'equal_to',
+              values: ['platinum'],
+              query_operator: nil
+            }.with_indifferent_access
+          ]
+
+          expected_count = Conversation.where("last_activity_at < ? AND custom_attributes->>'conversation_type' = ?", (Time.zone.today - 3.days),
+                                              'platinum').count
+
+          result = filter_service.new(params, user_1).perform
+          expect(result[:conversations].length).to be expected_count
+        end
+
+        it 'filter by last_activity_at 2_days_before' do
+          params[:payload] = [
+            {
+              attribute_key: 'last_activity_at',
+              filter_operator: 'days_before',
+              values: [3],
+              query_operator: nil
+            }.with_indifferent_access
+          ]
+
+          expected_count = Conversation.where('last_activity_at < ?', (Time.zone.today - 2.days)).count
+
+          result = filter_service.new(params, user_1).perform
+          expect(result[:conversations].length).to be expected_count
+        end
+      end
     end
   end
 end

From a737f89c473e64f9abdf8ff13a3e64edefa28877 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 4 Feb 2022 14:38:18 +0530
Subject: [PATCH 061/101] fix: Ongoing campaign URL validation (#3890)

---
 .../api/v1/accounts/campaigns_controller.rb   |  2 +-
 app/models/campaign.rb                        | 17 ++++++++++++
 .../campaign_conversation_builder_spec.rb     |  2 +-
 .../v1/accounts/campaigns_controller_spec.rb  | 27 ++++++++++++++++---
 .../v1/accounts/inboxes_controller_spec.rb    |  4 +--
 .../v1/widget/campaigns_controller_spec.rb    |  4 +--
 spec/listeners/campaign_listener_spec.rb      |  2 +-
 spec/models/campaign_spec.rb                  |  9 +++++--
 8 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/app/controllers/api/v1/accounts/campaigns_controller.rb b/app/controllers/api/v1/accounts/campaigns_controller.rb
index 11b563d81..18d0998c8 100644
--- a/app/controllers/api/v1/accounts/campaigns_controller.rb
+++ b/app/controllers/api/v1/accounts/campaigns_controller.rb
@@ -18,7 +18,7 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
   def show; end
 
   def update
-    @campaign.update(campaign_params)
+    @campaign.update!(campaign_params)
   end
 
   private
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 0093342d6..304d270e7 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -33,12 +33,14 @@
 #  fk_rails_...  (account_id => accounts.id) ON DELETE => cascade
 #  fk_rails_...  (inbox_id => inboxes.id) ON DELETE => cascade
 #
+require 'uri'
 class Campaign < ApplicationRecord
   validates :account_id, presence: true
   validates :inbox_id, presence: true
   validates :title, presence: true
   validates :message, presence: true
   validate :validate_campaign_inbox
+  validate :validate_url
   validate :prevent_completed_campaign_from_update, on: :update
   belongs_to :account
   belongs_to :inbox
@@ -86,6 +88,21 @@ class Campaign < ApplicationRecord
     end
   end
 
+  def validate_url
+    return unless trigger_rules['url']
+
+    errors.add(:url, 'invalid') if inbox.inbox_type == 'Website' && !url_valid?(trigger_rules['url'])
+  end
+
+  def url_valid?(url)
+    url = begin
+      URI.parse(url)
+    rescue StandardError
+      false
+    end
+    url.is_a?(URI::HTTP) || url.is_a?(URI::HTTPS)
+  end
+
   def prevent_completed_campaign_from_update
     errors.add :status, 'The campaign is already completed' if !campaign_status_changed? && completed?
   end
diff --git a/spec/builders/campaigns/campaign_conversation_builder_spec.rb b/spec/builders/campaigns/campaign_conversation_builder_spec.rb
index 076aeab67..3735c0e66 100644
--- a/spec/builders/campaigns/campaign_conversation_builder_spec.rb
+++ b/spec/builders/campaigns/campaign_conversation_builder_spec.rb
@@ -5,7 +5,7 @@ describe ::Campaigns::CampaignConversationBuilder do
   let(:inbox) { create(:inbox, account: account) }
   let(:contact) { create(:contact, account: account, identifier: '123') }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
-  let(:campaign) { create(:campaign, inbox: inbox, account: account) }
+  let(:campaign) { create(:campaign, inbox: inbox, account: account, trigger_rules: { url: 'https://test.com' }) }
 
   describe '#perform' do
     it 'creates a conversation with campaign id and message with campaign message' do
diff --git a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
index 4a9cfece0..9f2175007 100644
--- a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Campaigns API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
       let(:administrator) { create(:user, account: account, role: :administrator) }
-      let!(:campaign) { create(:campaign, account: account) }
+      let!(:campaign) { create(:campaign, account: account, trigger_rules: { url: 'https://test.com' }) }
 
       it 'returns unauthorized for agents' do
         get "/api/v1/accounts/#{account.id}/campaigns",
@@ -38,7 +38,7 @@ RSpec.describe 'Campaigns API', type: :request do
   end
 
   describe 'GET /api/v1/accounts/{account.id}/campaigns/:id' do
-    let(:campaign) { create(:campaign, account: account) }
+    let(:campaign) { create(:campaign, account: account, trigger_rules: { url: 'https://test.com' }) }
 
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
@@ -107,6 +107,25 @@ RSpec.describe 'Campaigns API', type: :request do
         expect(JSON.parse(response.body, symbolize_names: true)[:title]).to eq('test')
       end
 
+      it 'creates a new ongoing campaign' do
+        post "/api/v1/accounts/#{account.id}/campaigns",
+             params: { inbox_id: inbox.id, title: 'test', message: 'test message', trigger_rules: { url: 'https://test.com' } },
+             headers: administrator.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(JSON.parse(response.body, symbolize_names: true)[:title]).to eq('test')
+      end
+
+      it 'throws error when invalid url provided for ongoing campaign' do
+        post "/api/v1/accounts/#{account.id}/campaigns",
+             params: { inbox_id: inbox.id, title: 'test', message: 'test message', trigger_rules: { url: 'javascript' } },
+             headers: administrator.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
       it 'creates a new oneoff campaign' do
         twilio_sms = create(:channel_twilio_sms, account: account)
         twilio_inbox = create(:inbox, channel: twilio_sms)
@@ -133,7 +152,7 @@ RSpec.describe 'Campaigns API', type: :request do
 
   describe 'PATCH /api/v1/accounts/{account.id}/campaigns/:id' do
     let(:inbox) { create(:inbox, account: account) }
-    let!(:campaign) { create(:campaign, account: account) }
+    let!(:campaign) { create(:campaign, account: account, trigger_rules: { url: 'https://test.com' }) }
 
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
@@ -172,7 +191,7 @@ RSpec.describe 'Campaigns API', type: :request do
 
   describe 'DELETE /api/v1/accounts/{account.id}/campaigns/:id' do
     let(:inbox) { create(:inbox, account: account) }
-    let!(:campaign) { create(:campaign, account: account) }
+    let!(:campaign) { create(:campaign, account: account, trigger_rules: { url: 'https://test.com' }) }
 
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 8ccf667ac..5dc184b8c 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -133,7 +133,7 @@ RSpec.describe 'Inboxes API', type: :request do
       let(:agent) { create(:user, account: account, role: :agent) }
       let(:administrator) { create(:user, account: account, role: :administrator) }
 
-      let!(:campaign) { create(:campaign, account: account, inbox: inbox) }
+      let!(:campaign) { create(:campaign, account: account, inbox: inbox, trigger_rules: { url: 'https://test.com' }) }
 
       it 'returns unauthorized for agents' do
         get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/campaigns",
@@ -145,7 +145,7 @@ RSpec.describe 'Inboxes API', type: :request do
 
       it 'returns all campaigns belonging to the inbox to administrators' do
         # create a random campaign
-        create(:campaign, account: account)
+        create(:campaign, account: account, trigger_rules: { url: 'https://test.com' })
         get "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}/campaigns",
             headers: administrator.create_new_auth_token,
             as: :json
diff --git a/spec/controllers/api/v1/widget/campaigns_controller_spec.rb b/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
index 8a938b667..11248769f 100644
--- a/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/campaigns_controller_spec.rb
@@ -3,8 +3,8 @@ require 'rails_helper'
 RSpec.describe '/api/v1/widget/campaigns', type: :request do
   let(:account) { create(:account) }
   let(:web_widget) { create(:channel_widget, account: account) }
-  let!(:campaign_1) { create(:campaign, inbox: web_widget.inbox, enabled: true, account: account) }
-  let!(:campaign_2) { create(:campaign, inbox: web_widget.inbox, enabled: false, account: account) }
+  let!(:campaign_1) { create(:campaign, inbox: web_widget.inbox, enabled: true, account: account, trigger_rules: { url: 'https://test.com' }) }
+  let!(:campaign_2) { create(:campaign, inbox: web_widget.inbox, enabled: false, account: account, trigger_rules: { url: 'https://test.com' }) }
 
   describe 'GET /api/v1/widget/campaigns' do
     let(:params) { { website_token: web_widget.website_token } }
diff --git a/spec/listeners/campaign_listener_spec.rb b/spec/listeners/campaign_listener_spec.rb
index bfc5df08f..b9f693055 100644
--- a/spec/listeners/campaign_listener_spec.rb
+++ b/spec/listeners/campaign_listener_spec.rb
@@ -5,7 +5,7 @@ describe CampaignListener do
   let(:inbox) { create(:inbox, account: account) }
   let(:contact) { create(:contact, account: account, identifier: '123') }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
-  let(:campaign) { create(:campaign, inbox: inbox, account: account) }
+  let(:campaign) { create(:campaign, inbox: inbox, account: account, trigger_rules: { url: 'https://test.com' }) }
 
   let!(:event) do
     Events::Base.new('campaign_triggered', Time.zone.now,
diff --git a/spec/models/campaign_spec.rb b/spec/models/campaign_spec.rb
index 54936ac2b..95cac1caf 100644
--- a/spec/models/campaign_spec.rb
+++ b/spec/models/campaign_spec.rb
@@ -9,7 +9,10 @@ RSpec.describe Campaign, type: :model do
   end
 
   describe '.before_create' do
-    let(:campaign) { build(:campaign, display_id: nil) }
+    let(:account) { create(:account) }
+    let(:website_channel) { create(:channel_widget, account: account) }
+    let(:website_inbox) { create(:inbox, channel: website_channel, account: account) }
+    let(:campaign) { build(:campaign, inbox: website_inbox, display_id: nil, trigger_rules: { url: 'https://test.com' }) }
 
     before do
       campaign.save
@@ -37,7 +40,9 @@ RSpec.describe Campaign, type: :model do
   end
 
   context 'when a campaign is completed' do
-    let!(:campaign) { create(:campaign, campaign_status: :completed) }
+    let(:account) { create(:account) }
+    let(:web_widget) { create(:channel_widget, account: account) }
+    let!(:campaign) { create(:campaign, inbox: web_widget.inbox, campaign_status: :completed, trigger_rules: { url: 'https://test.com' }) }
 
     it 'would prevent further updates' do
       campaign.title = 'new name'

From 1a3d39a7f32f2ea106bd43f8f89e94e7fb7877be Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 7 Feb 2022 12:27:20 +0530
Subject: [PATCH 062/101] feat: Shows an alert while replying if chats are not
 assigned to them (#3867)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/components/ui/Banner.vue        | 129 ++++++++++++++++++
 .../widgets/conversation/MessagesView.vue     | 108 +++++----------
 .../widgets/conversation/ReplyBox.vue         |  69 +++++++++-
 .../i18n/locale/en/conversation.json          |   2 +
 4 files changed, 233 insertions(+), 75 deletions(-)
 create mode 100644 app/javascript/dashboard/components/ui/Banner.vue

diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue
new file mode 100644
index 000000000..52d7c5740
--- /dev/null
+++ b/app/javascript/dashboard/components/ui/Banner.vue
@@ -0,0 +1,129 @@
+<template>
+  <div class="banner" :class="bannerClasses">
+    <span>
+      {{ bannerMessage }}
+      <a
+        v-if="hrefLink"
+        :href="hrefLink"
+        rel="noopener noreferrer nofollow"
+        target="_blank"
+      >
+        {{ hrefLinkText }}
+      </a>
+    </span>
+    <woot-button
+      v-if="hasActionButton"
+      size="small"
+      variant="link"
+      icon="arrow-right"
+      color-scheme="primary"
+      class-names="banner-action__button"
+      @click="onClick"
+    >
+      {{ actionButtonLabel }}
+    </woot-button>
+    <woot-button
+      v-if="hasCloseButton"
+      size="small"
+      variant="link"
+      color-scheme="warning"
+      icon="dismiss-circle"
+      class-names="banner-action__button"
+      @click="onClickClose"
+    >
+    </woot-button>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    bannerMessage: {
+      type: String,
+      default: '',
+    },
+    hrefLink: {
+      type: String,
+      default: '',
+    },
+    hrefLinkText: {
+      type: String,
+      default: '',
+    },
+    hasActionButton: {
+      type: Boolean,
+      default: false,
+    },
+    actionButtonLabel: {
+      type: String,
+      default: '',
+    },
+    colorScheme: {
+      type: String,
+      default: '',
+    },
+    hasCloseButton: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    bannerClasses() {
+      return [this.colorScheme];
+    },
+  },
+  methods: {
+    onClick(e) {
+      this.$emit('click', e);
+    },
+    onClickClose(e) {
+      this.$emit('close', e);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.banner {
+  display: flex;
+  color: var(--white);
+  font-size: var(--font-size-mini);
+  padding: var(--space-slab) var(--space-normal);
+  justify-content: center;
+  position: sticky;
+
+  &.secondary {
+    background: var(--s-300);
+  }
+
+  &.alert {
+    background: var(--r-400);
+  }
+
+  &.warning {
+    background: var(--y-800);
+    color: var(--s-600);
+    a {
+      color: var(--s-600);
+    }
+  }
+
+  &.gray {
+    background: var(--b-500);
+  }
+
+  a {
+    text-decoration: underline;
+    color: var(--white);
+    font-size: var(--font-size-mini);
+  }
+
+  .banner-action__button {
+    margin: 0 var(--space-smaller);
+
+    ::v-deep .button__content {
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 93c47ebf6..44dac4d53 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -1,56 +1,29 @@
 <template>
   <div class="view-box fill-height">
-    <div
+    <banner
       v-if="!currentChat.can_reply && !isAWhatsappChannel"
-      class="banner messenger-policy--banner"
-    >
-      <span>
-        {{ $t('CONVERSATION.CANNOT_REPLY') }}
-        <a
-          :href="facebookReplyPolicy"
-          rel="noopener noreferrer nofollow"
-          target="_blank"
-        >
-          {{ $t('CONVERSATION.24_HOURS_WINDOW') }}
-        </a>
-      </span>
-    </div>
-    <div
-      v-if="!currentChat.can_reply && isAWhatsappChannel"
-      class="banner messenger-policy--banner"
-    >
-      <span>
-        {{ $t('CONVERSATION.TWILIO_WHATSAPP_CAN_REPLY') }}
-        <a
-          :href="twilioWhatsAppReplyPolicy"
-          rel="noopener noreferrer nofollow"
-          target="_blank"
-        >
-          {{ $t('CONVERSATION.TWILIO_WHATSAPP_24_HOURS_WINDOW') }}
-        </a>
-      </span>
-    </div>
+      color-scheme="alert"
+      :banner-message="$t('CONVERSATION.CANNOT_REPLY')"
+      :href-link="facebookReplyPolicy"
+      :href-link-text="$t('CONVERSATION.24_HOURS_WINDOW')"
+    />
+
+    <banner
+      v-if="!currentChat.can_reply && isAWhatsappChannel"
+      color-scheme="alert"
+      :banner-message="$t('CONVERSATION.TWILIO_WHATSAPP_CAN_REPLY')"
+      :href-link="twilioWhatsAppReplyPolicy"
+      :href-link-text="$t('CONVERSATION.TWILIO_WHATSAPP_24_HOURS_WINDOW')"
+    />
+
+    <banner
+      v-if="isATweet"
+      color-scheme="gray"
+      :banner-message="tweetBannerText"
+      :has-close-button="hasSelectedTweetId"
+      @close="removeTweetSelection"
+    />
 
-    <div v-if="isATweet" class="banner">
-      <span v-if="!selectedTweetId">
-        {{ $t('CONVERSATION.SELECT_A_TWEET_TO_REPLY') }}
-      </span>
-      <span v-else>
-        {{ $t('CONVERSATION.REPLYING_TO') }}
-        {{ selectedTweet.content || '' }}
-      </span>
-      <button
-        v-if="selectedTweetId"
-        class="banner-close-button"
-        @click="removeTweetSelection"
-      >
-        <fluent-icon
-          v-tooltip="$t('CONVERSATION.REMOVE_SELECTION')"
-          size="16"
-          icon="dismiss"
-        />
-      </button>
-    </div>
     <div class="sidebar-toggle__wrap">
       <woot-button
         variant="smooth"
@@ -126,6 +99,7 @@ import { mapGetters } from 'vuex';
 import ReplyBox from './ReplyBox';
 import Message from './Message';
 import conversationMixin from '../../../mixins/conversations';
+import Banner from 'dashboard/components/ui/Banner.vue';
 import { getTypingUsersText } from '../../../helper/commons';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import { REPLY_POLICY } from 'shared/constants/links';
@@ -139,6 +113,7 @@ export default {
   components: {
     Message,
     ReplyBox,
+    Banner,
   },
   mixins: [conversationMixin, inboxMixin, eventListenerMixins, clickaway],
   props: {
@@ -173,7 +148,17 @@ export default {
     inbox() {
       return this.$store.getters['inboxes/getInbox'](this.inboxId);
     },
+    hasSelectedTweetId() {
+      return !!this.selectedTweetId;
+    },
 
+    tweetBannerText() {
+      return !this.selectedTweetId
+        ? this.$t('CONVERSATION.SELECT_A_TWEET_TO_REPLY')
+        : `
+          ${this.$t('CONVERSATION.REPLYING_TO')}
+          ${this.selectedTweet.content}` || '';
+    },
     typingUsersList() {
       const userList = this.$store.getters[
         'conversationTypingStatus/getUserList'
@@ -375,31 +360,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.banner {
-  background: var(--b-500);
-  color: var(--white);
-  font-size: var(--font-size-mini);
-  padding: var(--space-slab) var(--space-normal);
-  text-align: center;
-  position: relative;
-
-  a {
-    text-decoration: underline;
-    color: var(--white);
-    font-size: var(--font-size-mini);
-  }
-
-  &.messenger-policy--banner {
-    background: var(--r-400);
-  }
-
-  .banner-close-button {
-    cursor: pointer;
-    margin-left: var(--space--two);
-    color: var(--white);
-  }
-}
-
 .spinner--container {
   min-height: var(--space-jumbo);
 }
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index b1fba6ce4..257b7bd3a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -1,5 +1,13 @@
 <template>
   <div class="reply-box" :class="replyBoxClass">
+    <banner
+      v-if="showSelfAssignBanner"
+      color-scheme="secondary"
+      :banner-message="$t('CONVERSATION.NOT_ASSIGNED_TO_YOU')"
+      :has-action-button="true"
+      :action-button-label="$t('CONVERSATION.ASSIGN_TO_ME')"
+      @click="onClickSelfAssign"
+    />
     <reply-top-panel
       :mode="replyType"
       :set-reply-mode="setReplyMode"
@@ -90,6 +98,7 @@ import AttachmentPreview from 'dashboard/components/widgets/AttachmentsPreview';
 import ReplyTopPanel from 'dashboard/components/widgets/WootWriter/ReplyTopPanel';
 import ReplyEmailHead from './ReplyEmailHead';
 import ReplyBottomPanel from 'dashboard/components/widgets/WootWriter/ReplyBottomPanel';
+import Banner from 'dashboard/components/ui/Banner.vue';
 import { REPLY_EDITOR_MODES } from 'dashboard/components/widgets/WootWriter/constants';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
@@ -117,6 +126,7 @@ export default {
     ReplyEmailHead,
     ReplyBottomPanel,
     WootMessageEditor,
+    Banner,
   },
   mixins: [clickaway, inboxMixin, uiSettingsMixin, alertMixin],
   props: {
@@ -150,6 +160,11 @@ export default {
     };
   },
   computed: {
+    ...mapGetters({
+      currentChat: 'getSelectedChat',
+      currentUser: 'getCurrentUser',
+    }),
+
     showRichContentEditor() {
       if (this.isOnPrivateNote) {
         return true;
@@ -164,7 +179,36 @@ export default {
       }
       return false;
     },
-    ...mapGetters({ currentChat: 'getSelectedChat' }),
+    assignedAgent: {
+      get() {
+        return this.currentChat.meta.assignee;
+      },
+      set(agent) {
+        const agentId = agent ? agent.id : 0;
+        this.$store.dispatch('setCurrentChatAssignee', agent);
+        this.$store
+          .dispatch('assignAgent', {
+            conversationId: this.currentChat.id,
+            agentId,
+          })
+          .then(() => {
+            this.showAlert(this.$t('CONVERSATION.CHANGE_AGENT'));
+          });
+      },
+    },
+    showSelfAssignBanner() {
+      if (this.message !== '' && !this.isOnPrivateNote) {
+        if (!this.assignedAgent) {
+          return true;
+        }
+        if (this.assignedAgent.id !== this.currentUser.id) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+
     enterToSendEnabled() {
       return !!this.uiSettings.enter_to_send_enabled;
     },
@@ -372,6 +416,29 @@ export default {
     toggleEnterToSend(enterToSendEnabled) {
       this.updateUISettings({ enter_to_send_enabled: enterToSendEnabled });
     },
+    onClickSelfAssign() {
+      const {
+        account_id,
+        availability_status,
+        available_name,
+        email,
+        id,
+        name,
+        role,
+        avatar_url,
+      } = this.currentUser;
+      const selfAssign = {
+        account_id,
+        availability_status,
+        available_name,
+        email,
+        id,
+        name,
+        role,
+        thumbnail: avatar_url,
+      };
+      this.assignedAgent = selfAssign;
+    },
     async sendMessage() {
       if (this.isReplyButtonDisabled) {
         return;
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index e3cf94b83..c545502ec 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Loading Conversations",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",

From 047070ad87a2a077a33346e8c619cc213aaa7815 Mon Sep 17 00:00:00 2001
From: hostup <52465293+hostup@users.noreply.github.com>
Date: Mon, 7 Feb 2022 08:14:05 +0100
Subject: [PATCH 063/101] chore: Fix translations in Swedish language (#3765)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/javascript/widget/i18n/locale/sv.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index 31f0e1ed2..feb07095a 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -10,7 +10,7 @@
   },
   "TEAM_AVAILABILITY": {
     "ONLINE": "Vi är online",
-    "OFFLINE": "We are away at the moment"
+    "OFFLINE": "Vi är borta för tillfället"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "Svarar vanligtvis inom några minuter",
@@ -22,7 +22,7 @@
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Se nya meddelanden",
     "CLOSE_MESSAGES_BUTTON": "Stäng",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "från",
     "BOT": "Bot"
   },
   "BUBBLE": {
@@ -38,17 +38,17 @@
       "FULL_NAME": {
         "LABEL": "Fullständigt namn",
         "PLACEHOLDER": "Vänligen ange ditt fullständiga namn",
-        "ERROR": "Full Name is required"
+        "ERROR": "Fullständigt namn krävs"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-postadress",
-        "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "PLACEHOLDER": "Vänligen ange din e-postadress",
+        "ERROR": "Ogiltig e-postadress"
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "LABEL": "Meddelande",
+        "PLACEHOLDER": "Vänligen ange ditt meddelande",
+        "ERROR": "Meddelandet är för kort"
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"

From 9f37a6e2ba7a7212bb419e318b8061f472e82d9f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 7 Feb 2022 13:04:27 +0530
Subject: [PATCH 064/101] fix: Render valid urls only in custom attributes
 (#3921)

---
 .../dashboard/components/CustomAttribute.vue         |  7 +++++--
 app/javascript/dashboard/helper/URLHelper.js         |  6 ++++++
 .../dashboard/helper/specs/URLHelper.spec.js         | 10 ++++++++++
 app/javascript/dashboard/mixins/attributeMixin.js    |  9 ++-------
 .../dashboard/mixins/specs/attributeMixin.spec.js    | 12 ------------
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/javascript/dashboard/components/CustomAttribute.vue b/app/javascript/dashboard/components/CustomAttribute.vue
index 6182a00cd..41773b125 100644
--- a/app/javascript/dashboard/components/CustomAttribute.vue
+++ b/app/javascript/dashboard/components/CustomAttribute.vue
@@ -63,7 +63,7 @@
           rel="noopener noreferrer"
           class="value"
         >
-          {{ value || '---' }}
+          {{ urlValue }}
         </a>
         <p v-else class="value">
           {{ displayValue || '---' }}
@@ -119,7 +119,7 @@ import format from 'date-fns/format';
 import { required, url } from 'vuelidate/lib/validators';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import MultiselectDropdown from 'shared/components/ui/MultiselectDropdown.vue';
-
+import { isValidURL } from '../helper/URLHelper';
 const DATE_FORMAT = 'yyyy-MM-dd';
 
 export default {
@@ -184,6 +184,9 @@ export default {
     isAttributeTypeDate() {
       return this.attributeType === 'date';
     },
+    urlValue() {
+      return isValidURL(this.value) ? this.value : '---';
+    },
     notAttributeTypeCheckboxAndList() {
       return !this.isAttributeTypeCheckbox && !this.isAttributeTypeList;
     },
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index 503b98f8e..e229ce7e4 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -37,3 +37,9 @@ export const accountIdFromPathname = pathname => {
   const accountId = isScoped ? Number(urlParam) : '';
   return accountId;
 };
+
+export const isValidURL = value => {
+  /* eslint-disable no-useless-escape */
+  const URL_REGEX = /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/gm;
+  return URL_REGEX.test(value);
+};
diff --git a/app/javascript/dashboard/helper/specs/URLHelper.spec.js b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
index 8b4a5266d..ade735642 100644
--- a/app/javascript/dashboard/helper/specs/URLHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
@@ -2,6 +2,7 @@ import {
   frontendURL,
   conversationUrl,
   accountIdFromPathname,
+  isValidURL,
 } from '../URLHelper';
 
 describe('#URL Helpers', () => {
@@ -48,4 +49,13 @@ describe('#URL Helpers', () => {
       expect(accountIdFromPathname('')).toBe('');
     });
   });
+
+  describe('isValidURL', () => {
+    it('should return true if valid url is passed', () => {
+      expect(isValidURL('https://chatwoot.com')).toBe(true);
+    });
+    it('should return false if invalid url is passed', () => {
+      expect(isValidURL('alert.window')).toBe(false);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/mixins/attributeMixin.js b/app/javascript/dashboard/mixins/attributeMixin.js
index d861ec059..6348067b2 100644
--- a/app/javascript/dashboard/mixins/attributeMixin.js
+++ b/app/javascript/dashboard/mixins/attributeMixin.js
@@ -1,5 +1,5 @@
 import { mapGetters } from 'vuex';
-
+import { isValidURL } from '../helper/URLHelper';
 export default {
   computed: {
     ...mapGetters({
@@ -63,16 +63,11 @@ export default {
         Number.isInteger(Number(attributeValue)) && Number(attributeValue) > 0
       );
     },
-    isAttributeLink(attributeValue) {
-      /* eslint-disable no-useless-escape */
-      const URL_REGEX = /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/gm;
-      return URL_REGEX.test(attributeValue);
-    },
     attributeDisplayType(attributeValue) {
       if (this.isAttributeNumber(attributeValue)) {
         return 'number';
       }
-      if (this.isAttributeLink(attributeValue)) {
+      if (isValidURL(attributeValue)) {
         return 'link';
       }
       return 'text';
diff --git a/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js b/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js
index 0c98f45c8..9a5efa463 100644
--- a/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js
+++ b/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js
@@ -92,18 +92,6 @@ describe('attributeMixin', () => {
     expect(wrapper.vm.attributeDisplayType(9988)).toBe('number');
   });
 
-  it('return true if link is passed', () => {
-    const Component = {
-      render() {},
-      title: 'TestComponent',
-      mixins: [attributeMixin],
-    };
-    const wrapper = shallowMount(Component, { store, localVue });
-    expect(wrapper.vm.isAttributeLink('https://www.chatwoot.com/pricing')).toBe(
-      true
-    );
-  });
-
   it('return true if number is passed', () => {
     const Component = {
       render() {},

From f4c0ce5dfac96e004f3a078aec68dc7244f6e9d7 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 7 Feb 2022 13:43:16 +0530
Subject: [PATCH 065/101] chore: Assign to agent who create new message from
 contact panel (#3924)

---
 .../conversation/contact/ConversationForm.vue          |  2 ++
 .../dashboard/store/modules/contactConversations.js    | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 923e6d408..fc0cb1681 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -133,6 +133,7 @@ export default {
     ...mapGetters({
       uiFlags: 'contacts/getUIFlags',
       conversationsUiFlags: 'contactConversations/getUIFlags',
+      currentUser: 'getCurrentUser',
     }),
     getNewConversation() {
       return {
@@ -141,6 +142,7 @@ export default {
         contactId: this.contact.id,
         message: { content: this.message },
         mailSubject: this.subject,
+        assigneeId: this.currentUser.id,
       };
     },
     targetInbox: {
diff --git a/app/javascript/dashboard/store/modules/contactConversations.js b/app/javascript/dashboard/store/modules/contactConversations.js
index 49eeabdc4..50bbb4f99 100644
--- a/app/javascript/dashboard/store/modules/contactConversations.js
+++ b/app/javascript/dashboard/store/modules/contactConversations.js
@@ -24,7 +24,14 @@ export const actions = {
     commit(types.default.SET_CONTACT_CONVERSATIONS_UI_FLAG, {
       isCreating: true,
     });
-    const { inboxId, message, contactId, sourceId, mailSubject } = params;
+    const {
+      inboxId,
+      message,
+      contactId,
+      sourceId,
+      mailSubject,
+      assigneeId,
+    } = params;
     try {
       const { data } = await ConversationApi.create({
         inbox_id: inboxId,
@@ -34,6 +41,7 @@ export const actions = {
           mail_subject: mailSubject,
         },
         message,
+        assignee_id: assigneeId,
       });
       commit(types.default.ADD_CONTACT_CONVERSATION, {
         id: contactId,

From 97675c61ea74a9925447d2d1a1e865fca4763a38 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@chatwoot.com>
Date: Mon, 7 Feb 2022 03:49:34 -0800
Subject: [PATCH 066/101] chore: Update to the latest translations (#3923)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../i18n/locale/ar/advancedFilters.json       |  55 +-
 .../dashboard/i18n/locale/ar/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ar/cannedMgmt.json  |   2 +-
 .../dashboard/i18n/locale/ar/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/ar/contact.json     |   7 +-
 .../i18n/locale/ar/contactFilters.json        |  26 +-
 .../i18n/locale/ar/conversation.json          |   5 +
 .../i18n/locale/ar/generalSettings.json       |   6 +-
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ar/index.js         |   6 +
 .../dashboard/i18n/locale/ar/settings.json    |  20 +-
 .../i18n/locale/bg/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/bg/automation.json  |  85 ++-
 .../dashboard/i18n/locale/bg/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/bg/contact.json     |   3 +
 .../i18n/locale/bg/contactFilters.json        |  16 +-
 .../i18n/locale/bg/conversation.json          |   7 +-
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/bg/index.js         |  49 ++
 .../dashboard/i18n/locale/bg/settings.json    |   6 +-
 .../i18n/locale/bg/teamsSettings.json         |   2 +-
 .../i18n/locale/ca/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/ca/agentMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ca/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ca/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ca/contact.json     |   3 +
 .../i18n/locale/ca/contactFilters.json        |  16 +-
 .../i18n/locale/ca/conversation.json          |   7 +-
 .../i18n/locale/ca/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ca/index.js         |   6 +
 .../dashboard/i18n/locale/ca/settings.json    |   6 +-
 .../i18n/locale/ca/teamsSettings.json         |   2 +-
 .../i18n/locale/cs/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/cs/automation.json  |  85 ++-
 .../dashboard/i18n/locale/cs/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/cs/contact.json     |   3 +
 .../i18n/locale/cs/contactFilters.json        |  16 +-
 .../i18n/locale/cs/conversation.json          |   7 +-
 .../i18n/locale/cs/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/cs/index.js         |   6 +
 .../dashboard/i18n/locale/cs/settings.json    |   6 +-
 .../i18n/locale/cs/teamsSettings.json         |   2 +-
 .../i18n/locale/da/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/da/automation.json  |  85 ++-
 .../dashboard/i18n/locale/da/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/da/contact.json     |   3 +
 .../i18n/locale/da/contactFilters.json        |  16 +-
 .../i18n/locale/da/conversation.json          |   7 +-
 .../i18n/locale/da/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/da/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/da/index.js         |   6 +
 .../dashboard/i18n/locale/da/settings.json    |   6 +-
 .../i18n/locale/da/teamsSettings.json         |   2 +-
 .../i18n/locale/de/advancedFilters.json       |  55 +-
 .../dashboard/i18n/locale/de/agentMgmt.json   |   2 +-
 .../i18n/locale/de/attributesMgmt.json        |   4 +-
 .../dashboard/i18n/locale/de/automation.json  |  85 ++-
 .../dashboard/i18n/locale/de/campaign.json    |   2 +-
 .../dashboard/i18n/locale/de/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/de/chatlist.json    |   4 +-
 .../dashboard/i18n/locale/de/contact.json     |  25 +-
 .../i18n/locale/de/contactFilters.json        |  16 +-
 .../i18n/locale/de/conversation.json          |  21 +-
 .../i18n/locale/de/generalSettings.json       |   4 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  70 ++-
 .../dashboard/i18n/locale/de/index.js         |   6 +
 .../i18n/locale/de/integrations.json          |   2 +-
 .../dashboard/i18n/locale/de/labelsMgmt.json  |   4 +-
 .../dashboard/i18n/locale/de/settings.json    |  10 +-
 .../i18n/locale/de/teamsSettings.json         |   8 +-
 .../i18n/locale/el/advancedFilters.json       |  91 ++-
 .../i18n/locale/el/attributesMgmt.json        |  56 +-
 .../dashboard/i18n/locale/el/automation.json  |  85 ++-
 .../dashboard/i18n/locale/el/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/el/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/el/contact.json     |  51 +-
 .../i18n/locale/el/contactFilters.json        |  44 +-
 .../i18n/locale/el/conversation.json          |  21 +-
 .../i18n/locale/el/generalSettings.json       |  72 +--
 .../dashboard/i18n/locale/el/inboxMgmt.json   | 112 +++-
 .../dashboard/i18n/locale/el/index.js         |   6 +
 .../dashboard/i18n/locale/el/settings.json    |  22 +-
 .../dashboard/i18n/locale/en/index.js         |  12 +-
 .../i18n/locale/es/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/es/automation.json  |  85 ++-
 .../dashboard/i18n/locale/es/campaign.json    |   2 +-
 .../dashboard/i18n/locale/es/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/es/chatlist.json    |  10 +-
 .../dashboard/i18n/locale/es/contact.json     |   5 +-
 .../i18n/locale/es/contactFilters.json        |  16 +-
 .../i18n/locale/es/conversation.json          |   7 +-
 .../i18n/locale/es/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   | 200 ++++---
 .../dashboard/i18n/locale/es/index.js         |   6 +
 .../dashboard/i18n/locale/es/settings.json    |   6 +-
 .../i18n/locale/es/teamsSettings.json         |   2 +-
 .../i18n/locale/fa/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/fa/automation.json  |  85 ++-
 .../dashboard/i18n/locale/fa/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/fa/contact.json     |   3 +
 .../i18n/locale/fa/contactFilters.json        |  18 +-
 .../i18n/locale/fa/conversation.json          |   5 +
 .../i18n/locale/fa/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/fa/index.js         |   6 +
 .../dashboard/i18n/locale/fa/labelsMgmt.json  |   2 +-
 .../dashboard/i18n/locale/fa/report.json      |  26 +-
 .../dashboard/i18n/locale/fa/settings.json    |  16 +-
 .../dashboard/i18n/locale/fa/signup.json      |  10 +-
 .../i18n/locale/fa/teamsSettings.json         |   2 +-
 .../i18n/locale/fi/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/fi/automation.json  |  85 ++-
 .../dashboard/i18n/locale/fi/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/fi/contact.json     |   3 +
 .../i18n/locale/fi/contactFilters.json        |  16 +-
 .../i18n/locale/fi/conversation.json          |   7 +-
 .../i18n/locale/fi/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/fi/index.js         |   6 +
 .../dashboard/i18n/locale/fi/settings.json    |   6 +-
 .../i18n/locale/fi/teamsSettings.json         |   2 +-
 .../i18n/locale/fr/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/fr/automation.json  |  85 ++-
 .../dashboard/i18n/locale/fr/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/fr/contact.json     |   3 +
 .../i18n/locale/fr/contactFilters.json        |  16 +-
 .../i18n/locale/fr/conversation.json          |   7 +-
 .../i18n/locale/fr/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/fr/index.js         |   6 +
 .../dashboard/i18n/locale/fr/settings.json    |   6 +-
 .../i18n/locale/fr/teamsSettings.json         |   2 +-
 .../i18n/locale/he/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/he/automation.json  |  85 ++-
 .../dashboard/i18n/locale/he/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/he/contact.json     |   3 +
 .../i18n/locale/he/contactFilters.json        |  16 +-
 .../i18n/locale/he/conversation.json          |   7 +-
 .../i18n/locale/he/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/he/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/he/index.js         |   6 +
 .../dashboard/i18n/locale/he/settings.json    |   6 +-
 .../i18n/locale/he/teamsSettings.json         |   2 +-
 .../i18n/locale/hi/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/hi/automation.json  |  85 ++-
 .../dashboard/i18n/locale/hi/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/hi/contact.json     |   3 +
 .../i18n/locale/hi/contactFilters.json        |  16 +-
 .../i18n/locale/hi/conversation.json          |   7 +-
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/hi/index.js         |   6 +
 .../dashboard/i18n/locale/hi/settings.json    |   6 +-
 .../i18n/locale/hi/teamsSettings.json         |   2 +-
 .../i18n/locale/hu/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/hu/agentMgmt.json   |  10 +-
 .../dashboard/i18n/locale/hu/automation.json  |  85 ++-
 .../dashboard/i18n/locale/hu/campaign.json    |   4 +-
 .../dashboard/i18n/locale/hu/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/hu/chatlist.json    |  12 +-
 .../dashboard/i18n/locale/hu/contact.json     | 103 ++--
 .../i18n/locale/hu/contactFilters.json        |  16 +-
 .../i18n/locale/hu/conversation.json          |  11 +-
 .../i18n/locale/hu/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/hu/index.js         |   6 +
 .../i18n/locale/hu/integrationApps.json       |   2 +-
 .../dashboard/i18n/locale/hu/settings.json    |  28 +-
 .../i18n/locale/hu/teamsSettings.json         |   4 +-
 .../i18n/locale/id/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/id/automation.json  |  87 ++-
 .../dashboard/i18n/locale/id/campaign.json    |   2 +-
 .../dashboard/i18n/locale/id/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/id/chatlist.json    |  12 +-
 .../dashboard/i18n/locale/id/contact.json     |  51 +-
 .../i18n/locale/id/contactFilters.json        |  16 +-
 .../i18n/locale/id/conversation.json          |  19 +-
 .../i18n/locale/id/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/id/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/id/index.js         |   6 +
 .../dashboard/i18n/locale/id/settings.json    |  16 +-
 .../i18n/locale/id/teamsSettings.json         |   2 +-
 .../i18n/locale/it/advancedFilters.json       |  57 +-
 .../dashboard/i18n/locale/it/agentMgmt.json   |  46 +-
 .../i18n/locale/it/attributesMgmt.json        |  22 +-
 .../dashboard/i18n/locale/it/automation.json  |  87 ++-
 .../dashboard/i18n/locale/it/campaign.json    |  26 +-
 .../dashboard/i18n/locale/it/cannedMgmt.json  |  28 +-
 .../dashboard/i18n/locale/it/chatlist.json    |  20 +-
 .../dashboard/i18n/locale/it/contact.json     |  53 +-
 .../i18n/locale/it/contactFilters.json        |  22 +-
 .../i18n/locale/it/conversation.json          |  33 +-
 .../i18n/locale/it/generalSettings.json       |  18 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   |  84 ++-
 .../dashboard/i18n/locale/it/index.js         |   6 +
 .../i18n/locale/it/integrationApps.json       |   8 +-
 .../i18n/locale/it/integrations.json          |  18 +-
 .../dashboard/i18n/locale/it/labelsMgmt.json  |  24 +-
 .../dashboard/i18n/locale/it/login.json       |   8 +-
 .../dashboard/i18n/locale/it/report.json      |  72 +--
 .../i18n/locale/it/resetPassword.json         |   4 +-
 .../i18n/locale/it/setNewPassword.json        |  10 +-
 .../dashboard/i18n/locale/it/settings.json    |  36 +-
 .../dashboard/i18n/locale/it/signup.json      |  16 +-
 .../i18n/locale/it/teamsSettings.json         |  22 +-
 .../i18n/locale/ja/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/ja/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ja/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ja/contact.json     |   3 +
 .../i18n/locale/ja/contactFilters.json        |  16 +-
 .../i18n/locale/ja/conversation.json          |   7 +-
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ja/index.js         |   6 +
 .../dashboard/i18n/locale/ja/settings.json    |   6 +-
 .../i18n/locale/ja/teamsSettings.json         |   2 +-
 .../i18n/locale/ko/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/ko/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ko/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ko/contact.json     |   3 +
 .../i18n/locale/ko/contactFilters.json        |  16 +-
 .../i18n/locale/ko/conversation.json          |   7 +-
 .../i18n/locale/ko/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ko/index.js         |   6 +
 .../dashboard/i18n/locale/ko/settings.json    |   6 +-
 .../i18n/locale/ko/teamsSettings.json         |   2 +-
 .../i18n/locale/lv/advancedFilters.json       |  86 +++
 .../dashboard/i18n/locale/lv/agentMgmt.json   | 113 ++++
 .../i18n/locale/lv/attributesMgmt.json        |  99 ++++
 .../dashboard/i18n/locale/lv/automation.json  |  89 +++
 .../dashboard/i18n/locale/lv/campaign.json    | 126 +++++
 .../dashboard/i18n/locale/lv/cannedMgmt.json  |  76 +++
 .../dashboard/i18n/locale/lv/chatlist.json    |  85 +++
 .../dashboard/i18n/locale/lv/contact.json     | 331 +++++++++++
 .../i18n/locale/lv/contactFilters.json        |  46 ++
 .../i18n/locale/lv/conversation.json          | 192 +++++++
 .../dashboard/i18n/locale/lv/csatMgmt.json    |   6 +
 .../i18n/locale/lv/generalSettings.json       | 131 +++++
 .../dashboard/i18n/locale/lv/inboxMgmt.json   | 527 ++++++++++++++++++
 .../dashboard/i18n/locale/lv/index.js         |  49 ++
 .../i18n/locale/lv/integrationApps.json       |  62 +++
 .../i18n/locale/lv/integrations.json          |  85 +++
 .../dashboard/i18n/locale/lv/labelsMgmt.json  |  70 +++
 .../dashboard/i18n/locale/lv/login.json       |  21 +
 .../dashboard/i18n/locale/lv/report.json      | 342 ++++++++++++
 .../i18n/locale/lv/resetPassword.json         |  15 +
 .../i18n/locale/lv/setNewPassword.json        |  20 +
 .../dashboard/i18n/locale/lv/settings.json    | 216 +++++++
 .../dashboard/i18n/locale/lv/signup.json      |  38 ++
 .../i18n/locale/lv/teamsSettings.json         | 125 +++++
 .../dashboard/i18n/locale/lv/webhooks.json    |   5 +
 .../i18n/locale/ml/advancedFilters.json       |  59 +-
 .../i18n/locale/ml/attributesMgmt.json        |  22 +-
 .../dashboard/i18n/locale/ml/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ml/campaign.json    |  20 +-
 .../dashboard/i18n/locale/ml/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ml/chatlist.json    |  10 +-
 .../dashboard/i18n/locale/ml/contact.json     |  41 +-
 .../i18n/locale/ml/contactFilters.json        |  18 +-
 .../i18n/locale/ml/conversation.json          |   9 +-
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ml/index.js         |   6 +
 .../i18n/locale/ml/integrations.json          |  10 +-
 .../dashboard/i18n/locale/ml/labelsMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ml/report.json      | 110 ++--
 .../dashboard/i18n/locale/ml/settings.json    |  10 +-
 .../i18n/locale/ml/teamsSettings.json         |   2 +-
 .../i18n/locale/ne/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/ne/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ne/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ne/contact.json     |   3 +
 .../i18n/locale/ne/contactFilters.json        |  16 +-
 .../i18n/locale/ne/conversation.json          |   7 +-
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ne/index.js         |   6 +
 .../dashboard/i18n/locale/ne/settings.json    |   6 +-
 .../i18n/locale/ne/teamsSettings.json         |   2 +-
 .../i18n/locale/nl/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/nl/automation.json  |  85 ++-
 .../dashboard/i18n/locale/nl/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/nl/contact.json     |   3 +
 .../i18n/locale/nl/contactFilters.json        |  16 +-
 .../i18n/locale/nl/conversation.json          |   7 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/nl/index.js         |   6 +
 .../dashboard/i18n/locale/nl/settings.json    |   6 +-
 .../i18n/locale/nl/teamsSettings.json         |   2 +-
 .../i18n/locale/no/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/no/automation.json  |  85 ++-
 .../dashboard/i18n/locale/no/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/no/contact.json     |   3 +
 .../i18n/locale/no/contactFilters.json        |  16 +-
 .../i18n/locale/no/conversation.json          |   7 +-
 .../i18n/locale/no/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/no/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/no/index.js         |   6 +
 .../dashboard/i18n/locale/no/settings.json    |   6 +-
 .../i18n/locale/no/teamsSettings.json         |   2 +-
 .../i18n/locale/pl/advancedFilters.json       |  65 ++-
 .../dashboard/i18n/locale/pl/agentMgmt.json   |   2 +-
 .../i18n/locale/pl/attributesMgmt.json        |   4 +-
 .../dashboard/i18n/locale/pl/automation.json  |  85 ++-
 .../dashboard/i18n/locale/pl/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/pl/chatlist.json    |   6 +-
 .../dashboard/i18n/locale/pl/contact.json     |  33 +-
 .../i18n/locale/pl/contactFilters.json        |  20 +-
 .../i18n/locale/pl/conversation.json          |  29 +-
 .../dashboard/i18n/locale/pl/csatMgmt.json    |   4 +-
 .../i18n/locale/pl/generalSettings.json       |   8 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |  76 ++-
 .../dashboard/i18n/locale/pl/index.js         |   6 +
 .../dashboard/i18n/locale/pl/labelsMgmt.json  |  26 +-
 .../dashboard/i18n/locale/pl/report.json      |  16 +-
 .../dashboard/i18n/locale/pl/settings.json    |  10 +-
 .../i18n/locale/pl/teamsSettings.json         |   4 +-
 .../i18n/locale/pt/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/pt/automation.json  |  85 ++-
 .../dashboard/i18n/locale/pt/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/pt/contact.json     |   3 +
 .../i18n/locale/pt/contactFilters.json        |  16 +-
 .../i18n/locale/pt/conversation.json          |   7 +-
 .../i18n/locale/pt/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/pt/index.js         |   6 +
 .../dashboard/i18n/locale/pt/settings.json    |   6 +-
 .../i18n/locale/pt/teamsSettings.json         |   2 +-
 .../i18n/locale/pt_BR/advancedFilters.json    |  53 +-
 .../i18n/locale/pt_BR/automation.json         |  85 ++-
 .../i18n/locale/pt_BR/cannedMgmt.json         |   6 +-
 .../dashboard/i18n/locale/pt_BR/contact.json  |   3 +
 .../i18n/locale/pt_BR/contactFilters.json     |  16 +-
 .../i18n/locale/pt_BR/conversation.json       |   7 +-
 .../i18n/locale/pt_BR/generalSettings.json    |   2 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |  68 ++-
 .../dashboard/i18n/locale/pt_BR/index.js      |   6 +
 .../dashboard/i18n/locale/pt_BR/settings.json |   6 +-
 .../i18n/locale/pt_BR/teamsSettings.json      |   2 +-
 .../i18n/locale/ro/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/ro/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ro/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ro/contact.json     |   3 +
 .../i18n/locale/ro/contactFilters.json        |  16 +-
 .../i18n/locale/ro/conversation.json          |   7 +-
 .../i18n/locale/ro/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ro/index.js         |   6 +
 .../dashboard/i18n/locale/ro/settings.json    |   6 +-
 .../i18n/locale/ro/teamsSettings.json         |   2 +-
 .../i18n/locale/ru/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/ru/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ru/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ru/contact.json     |   3 +
 .../i18n/locale/ru/contactFilters.json        |  16 +-
 .../i18n/locale/ru/conversation.json          |   5 +
 .../i18n/locale/ru/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |  66 ++-
 .../dashboard/i18n/locale/ru/index.js         |   6 +
 .../dashboard/i18n/locale/ru/settings.json    |   6 +-
 .../i18n/locale/sk/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/sk/automation.json  |  85 ++-
 .../dashboard/i18n/locale/sk/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/sk/contact.json     |   3 +
 .../i18n/locale/sk/contactFilters.json        |  16 +-
 .../i18n/locale/sk/conversation.json          |   7 +-
 .../dashboard/i18n/locale/sk/csatMgmt.json    |   4 +-
 .../i18n/locale/sk/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/sk/index.js         |   6 +
 .../dashboard/i18n/locale/sk/settings.json    |   6 +-
 .../i18n/locale/sk/teamsSettings.json         |   2 +-
 .../i18n/locale/sv/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/sv/automation.json  |  85 ++-
 .../dashboard/i18n/locale/sv/campaign.json    |   4 +-
 .../dashboard/i18n/locale/sv/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/sv/contact.json     |   3 +
 .../i18n/locale/sv/contactFilters.json        |  16 +-
 .../i18n/locale/sv/conversation.json          |   7 +-
 .../i18n/locale/sv/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/sv/index.js         |   6 +
 .../dashboard/i18n/locale/sv/settings.json    |   6 +-
 .../i18n/locale/sv/teamsSettings.json         |   2 +-
 .../i18n/locale/ta/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/ta/automation.json  |  85 ++-
 .../dashboard/i18n/locale/ta/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ta/contact.json     |   3 +
 .../i18n/locale/ta/contactFilters.json        |  16 +-
 .../i18n/locale/ta/conversation.json          |   7 +-
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/ta/index.js         |   6 +
 .../dashboard/i18n/locale/ta/settings.json    |   6 +-
 .../i18n/locale/ta/teamsSettings.json         |   2 +-
 .../i18n/locale/th/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/th/automation.json  |  85 ++-
 .../dashboard/i18n/locale/th/campaign.json    |  48 +-
 .../dashboard/i18n/locale/th/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/th/contact.json     | 107 ++--
 .../i18n/locale/th/contactFilters.json        |  16 +-
 .../i18n/locale/th/conversation.json          |  59 +-
 .../dashboard/i18n/locale/th/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/th/index.js         |   6 +
 .../dashboard/i18n/locale/th/settings.json    |   8 +-
 .../i18n/locale/th/teamsSettings.json         |   2 +-
 .../i18n/locale/tr/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/tr/automation.json  |  85 ++-
 .../dashboard/i18n/locale/tr/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/tr/contact.json     |   3 +
 .../i18n/locale/tr/contactFilters.json        |  16 +-
 .../i18n/locale/tr/conversation.json          |   7 +-
 .../i18n/locale/tr/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/tr/index.js         |   6 +
 .../dashboard/i18n/locale/tr/settings.json    |   6 +-
 .../i18n/locale/tr/teamsSettings.json         |   2 +-
 .../i18n/locale/uk/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/uk/automation.json  |  85 ++-
 .../dashboard/i18n/locale/uk/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/uk/contact.json     |   3 +
 .../i18n/locale/uk/contactFilters.json        |  16 +-
 .../i18n/locale/uk/conversation.json          |   7 +-
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/uk/index.js         |   6 +
 .../dashboard/i18n/locale/uk/settings.json    |   6 +-
 .../i18n/locale/uk/teamsSettings.json         |   2 +-
 .../i18n/locale/vi/advancedFilters.json       |  53 +-
 .../dashboard/i18n/locale/vi/automation.json  |  85 ++-
 .../dashboard/i18n/locale/vi/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/vi/contact.json     |   3 +
 .../i18n/locale/vi/contactFilters.json        |  16 +-
 .../i18n/locale/vi/conversation.json          |   7 +-
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |  68 ++-
 .../dashboard/i18n/locale/vi/index.js         |   6 +
 .../dashboard/i18n/locale/vi/settings.json    |   6 +-
 .../i18n/locale/vi/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/zh/index.js         |   6 +
 .../i18n/locale/zh_CN/advancedFilters.json    |  53 +-
 .../i18n/locale/zh_CN/automation.json         |  85 ++-
 .../i18n/locale/zh_CN/cannedMgmt.json         |   6 +-
 .../dashboard/i18n/locale/zh_CN/contact.json  |   3 +
 .../i18n/locale/zh_CN/contactFilters.json     |  16 +-
 .../i18n/locale/zh_CN/conversation.json       |   7 +-
 .../i18n/locale/zh_CN/generalSettings.json    |   2 +-
 .../i18n/locale/zh_CN/inboxMgmt.json          |  68 ++-
 .../dashboard/i18n/locale/zh_CN/index.js      |   6 +
 .../dashboard/i18n/locale/zh_CN/settings.json |   6 +-
 .../i18n/locale/zh_CN/teamsSettings.json      |   2 +-
 .../i18n/locale/zh_TW/advancedFilters.json    |  53 +-
 .../i18n/locale/zh_TW/automation.json         |  85 ++-
 .../i18n/locale/zh_TW/cannedMgmt.json         |   6 +-
 .../dashboard/i18n/locale/zh_TW/contact.json  |   3 +
 .../i18n/locale/zh_TW/contactFilters.json     |  16 +-
 .../i18n/locale/zh_TW/conversation.json       |   7 +-
 .../i18n/locale/zh_TW/inboxMgmt.json          |  68 ++-
 .../dashboard/i18n/locale/zh_TW/index.js      |   6 +
 .../dashboard/i18n/locale/zh_TW/settings.json |   6 +-
 .../i18n/locale/zh_TW/teamsSettings.json      |   2 +-
 app/javascript/widget/i18n/locale/ar.json     |   5 +
 app/javascript/widget/i18n/locale/bg.json     |   5 +
 app/javascript/widget/i18n/locale/ca.json     |   5 +
 app/javascript/widget/i18n/locale/cs.json     |   5 +
 app/javascript/widget/i18n/locale/da.json     |   5 +
 app/javascript/widget/i18n/locale/de.json     |  11 +-
 app/javascript/widget/i18n/locale/el.json     |   7 +-
 app/javascript/widget/i18n/locale/es.json     |   5 +
 app/javascript/widget/i18n/locale/fa.json     |   7 +-
 app/javascript/widget/i18n/locale/fi.json     |   5 +
 app/javascript/widget/i18n/locale/fr.json     |   5 +
 app/javascript/widget/i18n/locale/he.json     |   5 +
 app/javascript/widget/i18n/locale/hi.json     |   5 +
 app/javascript/widget/i18n/locale/hu.json     |  21 +-
 app/javascript/widget/i18n/locale/id.json     |   5 +
 app/javascript/widget/i18n/locale/it.json     |  27 +-
 app/javascript/widget/i18n/locale/ja.json     |   5 +
 app/javascript/widget/i18n/locale/ko.json     |   5 +
 app/javascript/widget/i18n/locale/lv.json     |  77 +++
 app/javascript/widget/i18n/locale/ml.json     |  41 +-
 app/javascript/widget/i18n/locale/ne.json     |   5 +
 app/javascript/widget/i18n/locale/nl.json     |   5 +
 app/javascript/widget/i18n/locale/no.json     |   5 +
 app/javascript/widget/i18n/locale/pl.json     |   9 +-
 app/javascript/widget/i18n/locale/pt.json     |   5 +
 app/javascript/widget/i18n/locale/pt_BR.json  |   5 +
 app/javascript/widget/i18n/locale/ro.json     |   5 +
 app/javascript/widget/i18n/locale/ru.json     |   5 +
 app/javascript/widget/i18n/locale/sk.json     |  11 +-
 app/javascript/widget/i18n/locale/sv.json     |  21 +-
 app/javascript/widget/i18n/locale/ta.json     |   5 +
 app/javascript/widget/i18n/locale/th.json     |   5 +
 app/javascript/widget/i18n/locale/tr.json     |   5 +
 app/javascript/widget/i18n/locale/uk.json     |   5 +
 app/javascript/widget/i18n/locale/vi.json     |   5 +
 app/javascript/widget/i18n/locale/zh_CN.json  |   5 +
 app/javascript/widget/i18n/locale/zh_TW.json  |   5 +
 config/locales/ar.yml                         |   4 +-
 config/locales/devise.de.yml                  |   4 +-
 config/locales/devise.it.yml                  |  24 +-
 config/locales/devise.lv.yml                  |  62 +++
 config/locales/devise.ml.yml                  |  10 +-
 config/locales/el.yml                         |   4 +-
 config/locales/fa.yml                         |   4 +-
 config/locales/hu.yml                         |  16 +-
 config/locales/it.yml                         |  48 +-
 config/locales/lv.yml                         | 103 ++++
 config/locales/ml.yml                         |   8 +-
 505 files changed, 13017 insertions(+), 1671 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/advancedFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/automation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/campaign.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/contactFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/csatMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/teamsSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/webhooks.json
 create mode 100644 app/javascript/widget/i18n/locale/lv.json
 create mode 100644 config/locales/devise.lv.yml
 create mode 100644 config/locales/lv.yml

diff --git a/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json
index f6932e66b..0919f9e7c 100644
--- a/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json
@@ -1,6 +1,6 @@
 {
   "FILTER": {
-    "TITLE": "تصفية المحادثة",
+    "TITLE": "تصفية المحادثات",
     "SUBTITLE": "إضافة فلاتر أدناه واضغط على 'إرسال' لتصفية المحادثات.",
     "ADD_NEW_FILTER": "إضافة فلتر",
     "FILTER_DELETE_ERROR": "يجب ان يكون لديك فلتر واحد على الاقل",
@@ -19,7 +19,9 @@
       "contains": "يحتوي",
       "does_not_contain": "لا يحتوي",
       "is_present": "موجود",
-      "is_not_present": "غير موجود"
+      "is_not_present": "غير موجود",
+      "is_greater_than": "هو أكبر من",
+      "is_lesser_than": "هو أقل من"
     },
     "ATTRIBUTES": {
       "STATUS": "الحالة",
@@ -31,7 +33,54 @@
       "LABELS": "الوسوم",
       "BROWSER_LANGUAGE": "لغة المتصفح",
       "COUNTRY_NAME": "اسم الدولة",
-      "REFERER_LINK": "رابط المرجع"
+      "REFERER_LINK": "رابط المرجع",
+      "CUSTOM_ATTRIBUTE_LIST": "القائمة",
+      "CUSTOM_ATTRIBUTE_TEXT": "النص",
+      "CUSTOM_ATTRIBUTE_NUMBER": "العدد",
+      "CUSTOM_ATTRIBUTE_LINK": "الرابط",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "مربع"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "الفلاتر القياسية",
+      "ADDITIONAL_FILTERS": "فلاتر إضافية",
+      "CUSTOM_ATTRIBUTES": "سمات مخصصة"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "هل تريد حفظ هذا الفلتر؟",
+        "LABEL": "تسمية هذا الفلتر",
+        "PLACEHOLDER": "أدخل اسم لهذا الفلتر",
+        "ERROR_MESSAGE": "الاسم مطلوب",
+        "SAVE_BUTTON": "حفظ الفلتر",
+        "CANCEL_BUTTON": "إلغاء",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "تم إنشاء طريقة عرض مخصصة بنجاح",
+          "ERROR_MESSAGE": "خطأ أثناء إنشاء طريقة عرض مخصصة"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "تم إنشاء طريقة عرض مخصصة بنجاح",
+          "ERROR_MESSAGE": "خطأ أثناء إنشاء طريقة عرض مخصصة"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "حذف الفلتر",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "تأكيد الحذف",
+            "MESSAGE": "هل أنت متأكد من حذف الفلتر ",
+            "YES": "نعم، احذف",
+            "NO": "لا، احتفظ به"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "تم حذف طريقة عرض مخصصة بنجاح",
+          "ERROR_MESSAGE": "حدث خطأ أثناء حذف المجلد"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "تم حذف العرض المخصص بنجاح",
+          "ERROR_MESSAGE": "حدث خطأ أثناء حذف طريقة عرض مخصصة"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/automation.json b/app/javascript/dashboard/i18n/locale/ar/automation.json
index e7c68ee65..a29b8d332 100644
--- a/app/javascript/dashboard/i18n/locale/ar/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "الأتمتة",
-    "HEADER_BTN_TXT": "إضافة قاعدة أتمتة"
+    "HEADER_BTN_TXT": "إضافة قاعدة أتمتة",
+    "LOADING": "جلب قواعد الأتمتة",
+    "SIDEBAR_TXT": "<p><b>قواعد الأتمتة الآليه</b> <p>يمكن للأتمتة استبدال وأتمتة العمليات القائمة التي تتطلب جهداً يدوياً. يمكنك القيام بالعديد من الأشياء مع التشغيل الآلي، بما في ذلك إضافة تسميات وتعيين المحادثة لأفضل وكيل. لذا يركز الفريق على ما يفعلونه على أفضل وجه ويقضي وقتاً قليلاً على المهام اليدوية.</p>",
+    "ADD": {
+      "TITLE": "إضافة قاعدة أتمتة",
+      "SUBMIT": "إنشاء",
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "FORM": {
+        "NAME": {
+          "LABEL": "اسم القاعدة",
+          "PLACEHOLDER": "أدخل اسم القاعدة",
+          "ERROR": "الاسم مطلوب"
+        },
+        "DESC": {
+          "LABEL": "الوصف",
+          "PLACEHOLDER": "ادخل وصف القاعدة",
+          "ERROR": "الوصف مطلوب"
+        },
+        "EVENT": {
+          "LABEL": "الحدث",
+          "PLACEHOLDER": "الرجاء اختيار واحد",
+          "ERROR": "الحدث مطلوب"
+        },
+        "CONDITIONS": {
+          "LABEL": "الشروط"
+        },
+        "ACTIONS": {
+          "LABEL": "الإجراءات"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "إضافة شرط",
+      "ACTION_BUTTON_LABEL": "إضافة إجراء",
+      "API": {
+        "SUCCESS_MESSAGE": "تمت إضافة قاعدة الأتمتة بنجاح",
+        "ERROR_MESSAGE": "تعذر إنشاء قاعدة أتمتة ، يرجى المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "الاسم",
+        "الوصف",
+        "مفعل",
+        "تم إنشاؤها في"
+      ],
+      "404": "لم يتم العثور على قواعد أتمتة"
+    },
+    "DELETE": {
+      "TITLE": "حذف قاعدة الأتمتة",
+      "SUBMIT": "حذف",
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "CONFIRM": {
+        "TITLE": "تأكيد الحذف",
+        "MESSAGE": "هل أنت متأكد من الحذف ",
+        "YES": "نعم، احذف ",
+        "NO": "لا، احتفظ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "تم حذف قاعدة الأتمتة بنجاح",
+        "ERROR_MESSAGE": "تعذر حذف قاعدة الأتمتة، يرجى المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "EDIT": {
+      "TITLE": "تعديل قاعدة الأتمتة",
+      "SUBMIT": "تعديل",
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "API": {
+        "SUCCESS_MESSAGE": "تم تحديث قاعدة الأتمتة بنجاح",
+        "ERROR_MESSAGE": "تعذر تحديث قاعدة الأتمتة، الرجاء المحاولة مرة أخرى في وقت لاحق"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "نسخ",
+      "API": {
+        "SUCCESS_MESSAGE": "تم نسخ الأتمتة بنجاح",
+        "ERROR_MESSAGE": "تعذر استنساخ قاعدة الأتمتة، الرجاء المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "FORM": {
+      "EDIT": "تعديل",
+      "CREATE": "إنشاء",
+      "DELETE": "حذف",
+      "CANCEL": "إلغاء",
+      "RESET_MESSAGE": "تغيير نوع الحدث سوف يعيد تعيين الشروط والأحداث التي أضفتها أدناه"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
index 03ce94ddf..e27633720 100644
--- a/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
@@ -17,7 +17,7 @@
     },
     "ADD": {
       "TITLE": "إضافة رد جاهز",
-      "DESC": "الردود الجاهزة هي قوالب رسائل معدة مسبقاً يمكن استخدامها لتسريع كتابة الردود في المحادثات .",
+      "DESC": "الردود الجاهزة هي قوالب رسائل معدة مسبقاً يمكن استخدامها لتسريع كتابة الردود في المحادثات.",
       "CANCEL_BUTTON_TEXT": "إلغاء",
       "FORM": {
         "SHORT_CODE": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/chatlist.json b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
index 95f425999..b404361d0 100644
--- a/app/javascript/dashboard/i18n/locale/ar/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
@@ -7,7 +7,7 @@
       "404": "لا توجد محادثات نشطة في هذه المجموعة."
     },
     "TAB_HEADING": "المحادثات",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "الإشارات",
     "SEARCH": {
       "INPUT": "البحث عن جهات الاتصال، المحادثات، قوالب الردود الجاهزة .."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 00d4b486b..095cfbb88 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -111,7 +111,7 @@
         "LABEL": "رقم الهاتف",
         "HELP": "يجب ان يحتوى رقم الهاتف على كود دولتك تسبقها علامة +\nمثال: +20101243567",
         "ERROR": "يجب ان تكون خانة رقم الهاتف إما فارغة او مكتملة مع رمز الدولة",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "رقم الهاتف هذا مستخدم لجهة اتصال أخرى."
       },
       "LOCATION": {
         "PLACEHOLDER": "أدخل موقع جهة الاتصال",
@@ -169,6 +169,7 @@
       "SUBMIT": "إرسال الرسالة",
       "CANCEL": "إلغاء",
       "SUCCESS_MESSAGE": "تم إرسال الرسالة!",
+      "GO_TO_CONVERSATION": "عرض",
       "ERROR_MESSAGE": "تعذر الإرسال! حاول مرة أخرى"
     }
   },
@@ -177,7 +178,9 @@
     "FIELDS": "تصنفيات جهات الاتصال",
     "SEARCH_BUTTON": "بحث",
     "SEARCH_INPUT_PLACEHOLDER": "بحث عن جهات الاتصال",
-    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS": "فلترة",
+    "FILTER_CONTACTS_SAVE": "حفظ الفلتر",
+    "FILTER_CONTACTS_DELETE": "حذف الفلتر",
     "LIST": {
       "LOADING_MESSAGE": "جاري تحميل جهات الاتصال...",
       "404": "لا توجد جهات اتصال تطابق بحثك 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ar/contactFilters.json b/app/javascript/dashboard/i18n/locale/ar/contactFilters.json
index bacccd97c..a1b33d318 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contactFilters.json
@@ -1,15 +1,15 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
+        "TITLE": "تصفية جهات الاتصال",
+        "SUBTITLE": "إضافة فلاتر أدناه واضغط على 'إرسال' لتصفية جهات الاتصال.",
         "ADD_NEW_FILTER": "إضافة فلتر",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
+        "CLEAR_ALL_FILTERS": "مسح جميع الفلاتر",
         "FILTER_DELETE_ERROR": "يجب ان يكون لديك فلتر واحد على الاقل",
         "SUBMIT_BUTTON_LABEL": "إرسال",
         "CANCEL_BUTTON_LABEL": "إلغاء",
         "CLEAR_BUTTON_LABEL": "مسح الفلاتر",
         "EMPTY_VALUE_ERROR": "القيمة مطلوبة",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "TOOLTIP_LABEL": "تصفية جهات الاتصال",
         "QUERY_DROPDOWN_LABELS": {
             "AND": "و",
             "OR": "أو"
@@ -20,15 +20,27 @@
             "contains": "يحتوي",
             "does_not_contain": "لا يحتوي",
             "is_present": "موجود",
-            "is_not_present": "غير موجود"
+            "is_not_present": "غير موجود",
+            "is_greater_than": "هو أكبر من",
+            "is_lesser_than": "هو أقل من"
         },
         "ATTRIBUTES": {
             "NAME": "الاسم",
             "EMAIL": "البريد الإلكتروني",
             "PHONE_NUMBER": "رقم الهاتف",
-            "IDENTIFIER": "Identifier",
+            "IDENTIFIER": "المعرف",
             "CITY": "المدينة",
-            "COUNTRY": "الدولة"
+            "COUNTRY": "الدولة",
+            "CUSTOM_ATTRIBUTE_LIST": "القائمة",
+            "CUSTOM_ATTRIBUTE_TEXT": "النص",
+            "CUSTOM_ATTRIBUTE_NUMBER": "العدد",
+            "CUSTOM_ATTRIBUTE_LINK": "الرابط",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "مربع"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "الفلاتر القياسية",
+            "ADDITIONAL_FILTERS": "فلاتر إضافية",
+            "CUSTOM_ATTRIBUTES": "سمات مخصصة"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index 0f24d9671..cf2da6208 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "جاري تحميل المحادثات",
     "CANNOT_REPLY": "لا يمكنك الرد بسبب",
     "24_HOURS_WINDOW": "قيد نافذة الـ 24 ساعة",
+    "NOT_ASSIGNED_TO_YOU": "لم يتم تعيين هذه المحادثة لك. هل ترغب في تعيين هذه المحادثة لنفسك؟",
+    "ASSIGN_TO_ME": "إسناد لي",
     "TWILIO_WHATSAPP_CAN_REPLY": "يمكنك فقط الرد على هذه المحادثة باستخدام رسالة قالب بسبب",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "قيد نافذة الـ 24 ساعة",
     "SELECT_A_TWEET_TO_REPLY": "الرجاء تحديد تغريدة للرد عليها.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "حجم الملف يتجاوز حد الاقصى وهو {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "غير قادر على إرسال هذه الرسالة، الرجاء المحاولة مرة أخرى لاحقاً",
     "SENT_BY": "أرسلت بواسطة:",
+    "BOT": "رد آلي",
+    "SEND_FAILED": "تعذر إرسال الرسالة! حاول مرة أخرى",
+    "TRY_AGAIN": "إعادة المحاولة",
     "ASSIGNMENT": {
       "SELECT_AGENT": "اختر وكيل",
       "REMOVE": "حذف",
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 9f281176d..20cc83306 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -14,8 +14,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "معرف الحساب",
+        "NOTE": "هذا المعرف مطلوب إذا كنت بصدد بناء تكامل على API"
       },
       "NAME": {
         "LABEL": "اسم الحساب",
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "عدد الأيام بعد التذكرة التي يجب أن يحل تلقائياً إذا لم يكن هناك أي نشاط",
         "PLACEHOLDER": "30",
-        "ERROR": "الرجاء إدخال مدة الحل التلقائي صحيحة (يوم واحد على الأقل)"
+        "ERROR": "الرجاء إدخال مدة حل تلقائي صالحة (حد أدنى 1 يوم والحد الأقصى 999 يوما)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "الاستمرار في المحادثة عبر رسائل البريد الإلكتروني مفعّل لحسابك.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index ccb219467..dca27df68 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -49,7 +49,7 @@
         "HELP": "لإضافة حساب تويتر الخاص بك كقناة تواصل، تحتاج إلى مصادقة حسابك على تويتر بك بالنقر على زر \"تسجيل الدخول باستخدام تويتر\" ",
         "ERROR_MESSAGE": "حدث خطأ أثناء الاتصال بـ Twitter، الرجاء المحاولة مرة أخرى",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "إنشاء محادثات من التغريدات المشار إليها"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "قناة SMS عبر Twilio",
-        "DESC": "ابدأ في دعم عملائك عبر الرسائل القصيرة بإستخدام Twilio."
+        "TITLE": "قناة SMS",
+        "DESC": "ابدأ في دعم عملائك عبر الرسائل القصيرة.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "تويليو",
+          "BANDWIDTH": "سعة الإنترنت"
+        },
+        "API": {
+          "ERROR_MESSAGE": "لم نتمكن من حفظ قناة الرسائل القصيرة"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "معرف الحساب",
+            "PLACEHOLDER": "الرجاء إدخال معرف حساب النطاق الترددي الخاص بك",
+            "ERROR": "هذا الحقل مطلوب"
+          },
+          "API_KEY": {
+            "LABEL": "مفتاح API",
+            "PLACEHOLDER": "الرجاء إدخال مفتاح API الخاص بك",
+            "ERROR": "هذا الحقل مطلوب"
+          },
+          "API_SECRET": {
+            "LABEL": "سرية API",
+            "PLACEHOLDER": "الرجاء إدخال مفتاح API الخاص بك",
+            "ERROR": "هذا الحقل مطلوب"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "معرف التطبيق",
+            "PLACEHOLDER": "الرجاء إدخال معرف تطبيق النطاق الترددي الخاص بك",
+            "ERROR": "هذا الحقل مطلوب"
+          },
+          "INBOX_NAME": {
+            "LABEL": "اسم صندوق الوارد لقناة التواصل",
+            "PLACEHOLDER": "الرجاء إدخال اسم القناة",
+            "ERROR": "هذا الحقل مطلوب"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "رقم الهاتف",
+            "PLACEHOLDER": "الرجاء إدخال رقم الهاتف الذي سيتم إرسال الرسائل منه.",
+            "ERROR": "الرجاء إدخال قيمة صحيحة. يجب أن يبدأ رقم الهاتف بعلامة `+`."
+          },
+          "SUBMIT_BUTTON": "إنشاء قناة عرض التردد",
+          "API": {
+            "ERROR_MESSAGE": "تعذر تكوين المصادقة بواسطة بيانات الاعتماد الخاصة بحسابك على Twilio، يرجى المحاولة مرة أخرى"
+          },
+          "API_CALLBACK": {
+            "TITLE": "عنوان Callback URL",
+            "SUBTITLE": "يتوجب تهيئة عنوان callback URL في إعدادات Twilio بإدخال القيمة أدناه."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "قناة واتساب",
@@ -305,6 +353,14 @@
         "ENABLED": "مفعل",
         "DISABLED": "معطّل"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "مفعل",
+        "DISABLED": "معطّل"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "مفعل",
+        "DISABLED": "معطّل"
+      },
       "ENABLE_HMAC": {
         "LABEL": "تمكين"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "تفعيل الإسناد التلقائي",
       "ENABLE_CSAT": "تمكين تقييم خدمة العملاء",
       "ENABLE_CSAT_SUB_TEXT": "تمكين/تعطيل تقييم خدمة العملاء بعد إنتهاء المحادثة",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "تمكين استمرارية المحادثة عبر البريد الإلكتروني",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "المحادثات ستستمر عبر البريد الإلكتروني إذا كان عنوان البريد الإلكتروني لجهة الاتصال متاحاً.",
       "INBOX_UPDATE_TITLE": "إعدادات قناة التواصل",
       "INBOX_UPDATE_SUB_TEXT": "تحديث إعدادات قناة التواصل",
       "AUTO_ASSIGNMENT_SUB_TEXT": "تمكين أو تعطيل الإسناد التلقائي للمحادثات الجديدة إلى الموظفين المضافين إلى قناة التواصل هذه.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "معرف صندوق الوارد",
       "INBOX_IDENTIFIER_SUB_TEXT": "استخدم رمز 'inbox_identifier' المعروض هنا للمصادقة على عملاء API الخاص بك.",
       "FORWARD_EMAIL_TITLE": "إعادة التوجيه إلى البريد الإلكتروني",
-      "FORWARD_EMAIL_SUB_TEXT": "بدء إعادة توجيه رسائل البريد الإلكتروني الخاصة بك إلى عنوان البريد الإلكتروني التالي."
+      "FORWARD_EMAIL_SUB_TEXT": "بدء إعادة توجيه رسائل البريد الإلكتروني الخاصة بك إلى عنوان البريد الإلكتروني التالي.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "السماح بالرسائل بعد حل المحادثة",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "السماح للمستخدمين النهائيين بإرسال رسائل حتى بعد تسوية المحادثة."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "إعادة التصريح",
diff --git a/app/javascript/dashboard/i18n/locale/ar/index.js b/app/javascript/dashboard/i18n/locale/ar/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ar/index.js
+++ b/app/javascript/dashboard/i18n/locale/ar/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index b3fa44d09..996837693 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -4,8 +4,8 @@
     "TITLE": "إعدادات الملف الشخصي",
     "BTN_TEXT": "تعديل الملف الشخصي",
     "DELETE_AVATAR": "حذف الصورة الرمزية",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
+    "AVATAR_DELETE_SUCCESS": "تم حذف الصورة الرمزية بنجاح",
+    "AVATAR_DELETE_FAILED": "حدث خطأ أثناء حذف الصورة الرمزية، الرجاء المحاولة مرة أخرى",
     "UPDATE_SUCCESS": "تم تحديث حسابك بنجاح",
     "PASSWORD_UPDATE_SUCCESS": "تم تغيير كلمة المرور بنجاح",
     "AFTER_EMAIL_CHANGED": "تم تحديث ملفك الشخصي بنجاح، الرجاء تسجيل الدخول مرة أخرى حيث أنه قد تم تغيير بيانات تسجيل الدخول الخاصة بك",
@@ -89,7 +89,7 @@
         "PLACEHOLDER": "الرجاء إدخال كلمة مرور جديدة"
       },
       "PASSWORD": {
-        "LABEL": "كلمة المرور",
+        "LABEL": "كلمة مرور جديدة",
         "ERROR": "الرجاء إدخال كلمة مرور بطول 6 أحرف أو أكثر",
         "PLACEHOLDER": "الرجاء إدخال كلمة مرور جديدة"
       },
@@ -103,7 +103,7 @@
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "يتغيرون",
     "CHANGE_ACCOUNTS": "تبديل الحساب",
-    "CONTACT_SUPPORT": "Contact Support",
+    "CONTACT_SUPPORT": "تواصل مع الدعم",
     "SELECTOR_SUBTITLE": "اختر حساباً من القائمة التالية",
     "PROFILE_SETTINGS": "إعدادات الملف الشخصي",
     "KEYBOARD_SHORTCUTS": "اختصارات لوحة المفاتيح",
@@ -136,7 +136,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "المحادثات",
     "ALL_CONVERSATIONS": "كل المحادثات",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "الإشارات",
     "REPORTS": "التقارير",
     "SETTINGS": "الإعدادات",
     "CONTACTS": "جهات الاتصال",
@@ -153,11 +153,13 @@
     "CUSTOM_ATTRIBUTES": "سمات مخصصة",
     "AUTOMATION": "الأتمتة",
     "TEAMS": "الفرق",
+    "CUSTOM_VIEWS_FOLDER": "المجلدات",
+    "CUSTOM_VIEWS_SEGMENTS": "الأجزاء",
     "ALL_CONTACTS": "جميع جهات الاتصال",
     "TAGGED_WITH": "مشار إليه بواسطة",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
+    "NEW_LABEL": "علامة جديدة",
+    "NEW_TEAM": "فريق جديد",
+    "NEW_INBOX": "صندوق الوارد الجديد",
     "REPORTS_OVERVIEW": "نظرة عامة",
     "CSAT": "CSAT",
     "CAMPAIGNS": "الحملات",
@@ -167,7 +169,7 @@
     "REPORTS_LABEL": "الوسوم",
     "REPORTS_INBOX": "صندوق الوارد",
     "REPORTS_TEAM": "الفريق",
-    "SET_AVAILABILITY_TITLE": "Set yourself as"
+    "SET_AVAILABILITY_TITLE": "تعيين نفسك كـ"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "أوه! لم نتمكن من العثور على الحساب. الرجاء إنشاء حساب جديد للمتابعة.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json b/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json
index 5c7c18456..07d2d3a08 100644
--- a/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Съдържа",
       "does_not_contain": "Не съдържа",
       "is_present": "Присъства",
-      "is_not_present": "Не присъства"
+      "is_not_present": "Не присъства",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Статус",
@@ -31,7 +33,54 @@
       "LABELS": "Етикети",
       "BROWSER_LANGUAGE": "Език на браузъра",
       "COUNTRY_NAME": "Име на държавата",
-      "REFERER_LINK": "Референтна връзка"
+      "REFERER_LINK": "Референтна връзка",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Персонализирани атрибути"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Отмени",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Потвърди изтриването",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Да, изтрий",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/automation.json b/app/javascript/dashboard/i18n/locale/bg/automation.json
index f832efe32..677b94604 100644
--- a/app/javascript/dashboard/i18n/locale/bg/automation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Автоматизация",
-    "HEADER_BTN_TXT": "Добавяне правило за автоматизация"
+    "HEADER_BTN_TXT": "Добавяне правило за автоматизация",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Добавяне правило за автоматизация",
+      "SUBMIT": "Създаване",
+      "CANCEL_BUTTON_TEXT": "Отмени",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Описание",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Действия"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Име",
+        "Описание",
+        "Активен",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Изтрий",
+      "CANCEL_BUTTON_TEXT": "Отмени",
+      "CONFIRM": {
+        "TITLE": "Потвърди изтриването",
+        "MESSAGE": "Сигурни ли сте за изтриването ",
+        "YES": "Да, изтрий ",
+        "NO": "Не, запази "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Редактирай",
+      "CANCEL_BUTTON_TEXT": "Отмени",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Редактирай",
+      "CREATE": "Създаване",
+      "DELETE": "Изтрий",
+      "CANCEL": "Отмени",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/bg/cannedMgmt.json
index 5e4c0c8d6..ea4c4caef 100644
--- a/app/javascript/dashboard/i18n/locale/bg/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Добавяне на готов отговор",
     "LOADING": "Извличане на готови отговори",
     "SEARCH_404": "Няма резултати отговарящи на тази заявка",
-    "SIDEBAR_TXT": "<p><b>Готови отговори</b> </p><p> Готовите отговори са запазени шаблони за отговори, които могат да се използват за бързо изпращане на отговор в разговора. </p><p> За да създадете готов отговор, просто щракнете върху <b>Добавяне на готов отговор</b>. Можете също да редактирате или изтриете съществуващ готов отговор, като щракнете върху бутона Редактиране или Изтриване </p><p> Готовите отговори се използват с помощта на <b>Кратки кодове</b>. Агентите имат достъп до готовите отговори, докато са в чат, като напишат <b>'/'</b>, последвано от краткия код. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Няма налични готови отговори в този акаунт.",
       "TITLE": "Управлявайте готовите отговори",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Добавяне на готов отговор",
-      "DESC": "Готовите отговори са предварително дефинирани шаблони за отговор, които могат да се изпращат бързо в чата.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Отмени",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Кратък код",
-          "PLACEHOLDER": "Моля, въведете кратък код",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Краткия код е задължителен"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index 3fb2c47ec..7817401fa 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Изпрати съобщение",
       "CANCEL": "Отмени",
       "SUCCESS_MESSAGE": "Съобщението е изпратено!",
+      "GO_TO_CONVERSATION": "View",
       "ERROR_MESSAGE": "Не може да се изпрати! Опитайте пак"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Търсене",
     "SEARCH_INPUT_PLACEHOLDER": "Търсене на контакти",
     "FILTER_CONTACTS": "Филтър",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Зареждане на контактите...",
       "404": "Няма контакти отговарящи на търсенети ви 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/bg/contactFilters.json b/app/javascript/dashboard/i18n/locale/bg/contactFilters.json
index 63f286404..c8d20ebe1 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Съдържа",
             "does_not_contain": "Не съдържа",
             "is_present": "Присъства",
-            "is_not_present": "Не присъства"
+            "is_not_present": "Не присъства",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Име",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Телефон",
             "IDENTIFIER": "Идентификатор",
             "CITY": "Град",
-            "COUNTRY": "Държава"
+            "COUNTRY": "Държава",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Персонализирани атрибути"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index 239f9876d..fb6d9082a 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Loading Conversations",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Бот",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Remove",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index c30c8da61..b39e26754 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Име на входящата кутия",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Телефон",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Включен",
+        "DISABLED": "Изключен"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Включен",
+        "DISABLED": "Изключен"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reauthorize",
diff --git a/app/javascript/dashboard/i18n/locale/bg/index.js b/app/javascript/dashboard/i18n/locale/bg/index.js
new file mode 100644
index 000000000..5c1449fab
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/index.js
@@ -0,0 +1,49 @@
+import { default as _advancedFilters } from './advancedFilters.json';
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
+import { default as _campaign } from './campaign.json';
+import { default as _cannedMgmt } from './cannedMgmt.json';
+import { default as _chatlist } from './chatlist.json';
+import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
+import { default as _conversation } from './conversation.json';
+import { default as _csatMgmtMgmt } from './csatMgmt.json';
+import { default as _generalSettings } from './generalSettings.json';
+import { default as _inboxMgmt } from './inboxMgmt.json';
+import { default as _integrationApps } from './integrationApps.json';
+import { default as _integrations } from './integrations.json';
+import { default as _labelsMgmt } from './labelsMgmt.json';
+import { default as _login } from './login.json';
+import { default as _report } from './report.json';
+import { default as _resetPassword } from './resetPassword.json';
+import { default as _setNewPassword } from './setNewPassword.json';
+import { default as _settings } from './settings.json';
+import { default as _signup } from './signup.json';
+import { default as _teamsSettings } from './teamsSettings.json';
+
+export default {
+  ..._advancedFilters,
+  ..._agentMgmt,
+  ..._attributesMgmt,
+  ..._automation,
+  ..._campaign,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._contactFilters,
+  ..._conversation,
+  ..._csatMgmtMgmt,
+  ..._generalSettings,
+  ..._inboxMgmt,
+  ..._integrationApps,
+  ..._integrations,
+  ..._labelsMgmt,
+  ..._login,
+  ..._report,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._teamsSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 4cc0b9e0b..880d84b95 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Password",
+        "LABEL": "New password",
         "ERROR": "Please enter a password of length 6 or more",
         "PLACEHOLDER": "Please enter a new password"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirm new password",
         "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your password"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Персонализирани атрибути",
     "AUTOMATION": "Автоматизация",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json b/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json
index 446833023..76578ba45 100644
--- a/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
index 85dedb32c..6767c66bf 100644
--- a/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Estat",
@@ -31,7 +33,54 @@
       "LABELS": "Etiquetes",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Atributs personalitzats"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Cancel·la",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirma l'esborrat",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Si, esborra",
+            "NO": "No, manten-la"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
index 5825659c5..c726ba83a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
@@ -90,12 +90,12 @@
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "No results found."
+      "NO_RESULTS": "No s'ha trobat agents."
     },
     "MULTI_SELECTOR": {
-      "PLACEHOLDER": "None",
+      "PLACEHOLDER": "Ningú",
       "TITLE": {
-        "AGENT": "Select agent",
+        "AGENT": "Seleccionar Agent",
         "TEAM": "Select team"
       },
       "SEARCH": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/automation.json b/app/javascript/dashboard/i18n/locale/ca/automation.json
index c3614a990..f0a457afe 100644
--- a/app/javascript/dashboard/i18n/locale/ca/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Crear",
+      "CANCEL_BUTTON_TEXT": "Cancel·la",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Descripció",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Accions"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nom",
+        "Descripció",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Esborrar",
+      "CANCEL_BUTTON_TEXT": "Cancel·la",
+      "CONFIRM": {
+        "TITLE": "Confirma l'esborrat",
+        "MESSAGE": "N'estas segur? ",
+        "YES": "Si, esborra ",
+        "NO": "No, segueix "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Edita",
+      "CANCEL_BUTTON_TEXT": "Cancel·la",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edita",
+      "CREATE": "Crear",
+      "DELETE": "Esborrar",
+      "CANCEL": "Cancel·la",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
index ac8213a86..0c6ffecdb 100644
--- a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Afegeix una resposta predeterminada",
     "LOADING": "S'estan recollint les respostes predeterminades",
     "SEARCH_404": "No hi ha cap resposta que coincideixi amb aquesta consulta",
-    "SIDEBAR_TXT": "<p><b>Respostes predeterminades</b> </p><p> Les respostes predeterminades són plantilles de resposta que es poden utilitzar per enviar ràpidament una resposta a una conversa .</p><p> Per crear una Resposta Predeterminada, clica en <b>Afegir Resposta Predeterminada</b>. També pots editar o suprimir una resposta predeterminada fent clic al botó Edita o Suprimeix </p><p> Les respostes predeterminades s'utilitzen amb l'ajuda dels <b>Codi curt</b>. Els agents poden accedir a les respostes predeterminades en un xat escrivint <b>'/'</b> seguit del codi curt. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "No hi ha respostes predeterminades disponibles en aquest compte.",
       "TITLE": "Gestiona les respostes predeterminades",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Afegeix Resposta Predeterminada",
-      "DESC": "Les respostes predeterminades són plantilles de resposta que es poden utilitzar per enviar ràpidament les respostes a les converses.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Cancel·la",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Codi curt",
-          "PLACEHOLDER": "Introduïu un codi curt",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "És necessari el codi curt"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 2fc7af8e8..32fa09a8f 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Cancel·la",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Veure",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Cercar",
     "SEARCH_INPUT_PLACEHOLDER": "Cerca de contactes",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Carregant contactes...",
       "404": "No hi ha cap contacte que coincideixi amb la vostra cerca 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ca/contactFilters.json b/app/javascript/dashboard/i18n/locale/ca/contactFilters.json
index 16092393e..cb9d65cf0 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nom",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Número de telèfon",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Atributs personalitzats"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 55fffe65a..49332faec 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "S'estan carregant les converses",
     "CANNOT_REPLY": "No pots respondre degut a",
     "24_HOURS_WINDOW": "Restricció de finestra de missatges de 24 hores",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restricció de finestra de missatges de 24 hores",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Enviat per:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Seleccionar Agent",
       "REMOVE": "Suprimeix",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 4293f6a74..d98934a13 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "El nombre de dies després que un ticket es resolgui automàticament si no hi ha activitat",
         "PLACEHOLDER": "30",
-        "ERROR": "Introdueix una durada vàlida de resolució automàtica (mínim 1 dia)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuïtat de converses amb correus electrònics està habilitada per al vostre compte.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index ed2115148..db30ea0ba 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Activa la salutació del canal",
-          "HELP_TEXT": "Envia un missatge de felicitació a l'usuari quan comenci la conversa.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Habilita",
           "DISABLED": "Inhabilita"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Aquest camp és obligatori"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Aquest camp és obligatori"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Aquest camp és obligatori"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Aquest camp és obligatori"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nom de la safata d'entrada",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Aquest camp és obligatori"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Número de telèfon",
+            "PLACEHOLDER": "Introduïu el número de telèfon des del qual serà enviat el missatge.",
+            "ERROR": "Introduïu un valor vàlid. El número de telèfon hauria de començar amb el signe `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Habilita",
         "DISABLED": "Inhabilita"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Habilita",
+        "DISABLED": "Inhabilita"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Habilita",
+        "DISABLED": "Inhabilita"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Activa l'assignació automàtica",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Configuració de la safata d'entrada",
       "INBOX_UPDATE_SUB_TEXT": "Actualitza la configuració de la safata d'entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activa o desactiva l'assignació automàtica d'agents disponibles a les noves converses",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Comença a reenviar els teus correus electrònics a la següent adreça electrònica."
+      "FORWARD_EMAIL_SUB_TEXT": "Comença a reenviar els teus correus electrònics a la següent adreça electrònica.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautoritza",
diff --git a/app/javascript/dashboard/i18n/locale/ca/index.js b/app/javascript/dashboard/i18n/locale/ca/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ca/index.js
+++ b/app/javascript/dashboard/i18n/locale/ca/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 8bd50be7b..a237d9c57 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Contrasenya",
+        "LABEL": "New password",
         "ERROR": "Introduïu una contrasenya d'una longitud de 6 o més",
         "PLACEHOLDER": "Introduïu una nova contrasenya"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirmació de la nova contrasenya",
         "ERROR": "Confirmeu que les contrasenyes coincideixin",
-        "PLACEHOLDER": "Torneu a introduir la vostra contrasenya"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Atributs personalitzats",
     "AUTOMATION": "Automation",
     "TEAMS": "Equips",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
index ff4eb7197..70290bc6a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Equips",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json b/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json
index e76d34c8c..5ce945dd6 100644
--- a/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Stav",
@@ -31,7 +33,54 @@
       "LABELS": "Štítky",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Vlastní atributy"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Zrušit",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Potvrdit odstranění",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Ano, odstranit",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/automation.json b/app/javascript/dashboard/i18n/locale/cs/automation.json
index c3614a990..d74cfbbac 100644
--- a/app/javascript/dashboard/i18n/locale/cs/automation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Zrušit",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Akce"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Název",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Vymazat",
+      "CANCEL_BUTTON_TEXT": "Zrušit",
+      "CONFIRM": {
+        "TITLE": "Potvrdit odstranění",
+        "MESSAGE": "Opravdu chcete odstranit ",
+        "YES": "Ano, odstranit ",
+        "NO": "Ne, zachovat "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Upravit",
+      "CANCEL_BUTTON_TEXT": "Zrušit",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Upravit",
+      "CREATE": "Create",
+      "DELETE": "Vymazat",
+      "CANCEL": "Zrušit",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json
index 581320777..4bc84914e 100644
--- a/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Přidat konzervovanou odpověď",
     "LOADING": "Načítání Konzervovaných odpovědí",
     "SEARCH_404": "Neexistují žádné položky odpovídající tomuto dotazu",
-    "SIDEBAR_TXT": "<p><b>Canned Response</b> </p><p> Canned Response are saved šablony odpovědí, které mohou být použity pro rychlé odeslání odpovědi do konverzace . </p><p> Pro vytvoření Canned Response klikněte na <b>Přidat Canned Response</b>. Můžete také upravit nebo odstranit existující Canned Response kliknutím na tlačítko Upravit nebo vymazat </p><p> Rušené odpovědi jsou použity s pomocí <b>Krátké kódy</b>. Pracovníci mohou během chatu získat přístup k uloženým odpovědím napsaním <b>'/'</b> následovaným krátkým kódem. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "V tomto účtu nejsou k dispozici žádné konzervované odpovědi.",
       "TITLE": "Spravovat konzervované odpovědi",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Přidat konzervovanou odpověď",
-      "DESC": "Konzervované odpovědi jsou uložené šablony odpovědí, které lze použít pro rychlé odeslání odpovědi do konverzace .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Zrušit",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krátký kód",
-          "PLACEHOLDER": "Zadejte zkratkový kód",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Krátký kód je povinný"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 9e327fe1b..f1a9869bb 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Zrušit",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Zobrazit",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Hledat",
     "SEARCH_INPUT_PLACEHOLDER": "Hledat kontakty",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Načítání kontaktů...",
       "404": "Vašemu hledání neodpovídají žádné kontakty 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/cs/contactFilters.json b/app/javascript/dashboard/i18n/locale/cs/contactFilters.json
index 5c457beee..14b647dce 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Název",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefonní číslo",
             "IDENTIFIER": "Identifier",
             "CITY": "Město",
-            "COUNTRY": "Země"
+            "COUNTRY": "Země",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Vlastní atributy"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index f21523cdf..f96181c05 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Načítání konverzací",
     "CANNOT_REPLY": "Nemůžete odpovědět z důvodu",
     "24_HOURS_WINDOW": "24 hodinové omezení okna",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Přiřadit mi",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hodinové omezení okna",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Soubor překračuje limit {MAXIMUM_FILE_UPLOAD_SIZE} přílohy",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Odeslal:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Vybrat agenta",
       "REMOVE": "Odebrat",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Pozvěte své členy týmu",
-      "DESCRIPTION": "Vzhledem k tomu, že se připravujete na rozhovory se zákazníkem, vdechněte své týmové spolupracovníky, kteří vám pomohou. Můžete pozvat své přátele přidáním jejich e-mailové adresy do seznamu agentů.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Klikněte zde pro pozvání člena týmu"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index 759885774..77c610031 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Počet dnů, po kterých by měl být ticket automaticky vyřešen při žádné aktivitě",
         "PLACEHOLDER": "30",
-        "ERROR": "Zadejte platnou hodnotu automatického vyřešení (minimálně 1 den)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "E-mailová konverzace je u vašeho účtu povolena.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 05e8b5b59..86f039f7a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Povolit uvítání",
-          "HELP_TEXT": "Poslat uvítací zprávu uživateli, když začne konverzaci.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Povoleno",
           "DISABLED": "Zakázáno"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Toto pole je povinné"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Toto pole je povinné"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Toto pole je povinné"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Toto pole je povinné"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Název schránky",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Toto pole je povinné"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefonní číslo",
+            "PLACEHOLDER": "Zadejte prosím telefonní číslo, ze kterého bude zpráva odeslána.",
+            "ERROR": "Zadejte platnou hodnotu. Telefonní číslo by mělo začínat znakem `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Povoleno",
         "DISABLED": "Zakázáno"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Povoleno",
+        "DISABLED": "Zakázáno"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Povoleno",
+        "DISABLED": "Zakázáno"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Povolit automatické přiřazení",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Nastavení doručené pošty",
       "INBOX_UPDATE_SUB_TEXT": "Aktualizujte nastavení doručené pošty",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Povolit nebo zakázat automatické přiřazování nových konverzací agentům přidaným do této schránky.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Znovu autorizovat",
diff --git a/app/javascript/dashboard/i18n/locale/cs/index.js b/app/javascript/dashboard/i18n/locale/cs/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/cs/index.js
+++ b/app/javascript/dashboard/i18n/locale/cs/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 80c702ce1..eb5e6f7c1 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Heslo",
+        "LABEL": "New password",
         "ERROR": "Zadejte prosím heslo o délce 6 nebo více",
         "PLACEHOLDER": "Zadejte prosím nové heslo"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Potvrdit nové heslo",
         "ERROR": "Potvrzení hesla by mělo odpovídat heslu",
-        "PLACEHOLDER": "Zadejte prosím znovu své heslo"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Vlastní atributy",
     "AUTOMATION": "Automation",
     "TEAMS": "Týmy",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
index a94cdd289..33c6168ac 100644
--- a/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Týmy",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/da/advancedFilters.json b/app/javascript/dashboard/i18n/locale/da/advancedFilters.json
index 1d9f01d93..baa780789 100644
--- a/app/javascript/dashboard/i18n/locale/da/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/da/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Etiketter",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Brugerdefinerede Egenskaber"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Annuller",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Bekræft Sletning",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Ja, Slet",
+            "NO": "Nej, behold det"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/automation.json b/app/javascript/dashboard/i18n/locale/da/automation.json
index c3614a990..487f43910 100644
--- a/app/javascript/dashboard/i18n/locale/da/automation.json
+++ b/app/javascript/dashboard/i18n/locale/da/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Opret",
+      "CANCEL_BUTTON_TEXT": "Annuller",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Beskrivelse",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Handlinger"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Navn",
+        "Beskrivelse",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Slet",
+      "CANCEL_BUTTON_TEXT": "Annuller",
+      "CONFIRM": {
+        "TITLE": "Bekræft Sletning",
+        "MESSAGE": "Er du sikker på du vil slette ",
+        "YES": "Ja, Slet ",
+        "NO": "Nej, Behold "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Rediger",
+      "CANCEL_BUTTON_TEXT": "Annuller",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Rediger",
+      "CREATE": "Opret",
+      "DELETE": "Slet",
+      "CANCEL": "Annuller",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
index 29bd0148a..8fb42bf2a 100644
--- a/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Tilføj Standardsvar",
     "LOADING": "Henter Standardsvar",
     "SEARCH_404": "Der er ingen elementer, der matcher denne forespørgsel",
-    "SIDEBAR_TXT": "<p><b>Standardsvar</b> </p><p> Standardsvar er gemte svarskabeloner, som kan bruges til hurtigt at sende et svar på en samtale. </p><p> For at oprette et standardsvar, klik blot på <b>Tilføj standardsvar</b>. Du kan også redigere eller slette et eksisterende standardsvar ved at klikke på Rediger eller Slet knappen </p><p> Standardsvar bruges ved hjælp af <b>Short Codes</b>. Agenter kan tilgå standardsvar på en chat ved at skrive <b>'/'</b> efterfulgt af din short code </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Der er ingen tilgængelige standardsvar på denne konto.",
       "TITLE": "Administrer standardsvar",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Tilføj Standardsvar",
-      "DESC": "Standardsvar er gemte svarskabeloner, som kan bruges til hurtigt at sende svar til samtalen .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Annuller",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Short Code",
-          "PLACEHOLDER": "Indtast venligst en shortcode",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Short Code er påkrævet"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 1ebaf2d5b..aff9aa65b 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send besked",
       "CANCEL": "Annuller",
       "SUCCESS_MESSAGE": "Besked sendt!",
+      "GO_TO_CONVERSATION": "Vis",
       "ERROR_MESSAGE": "Kunne ikke sendes! prøv igen"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Søg",
     "SEARCH_INPUT_PLACEHOLDER": "Søg efter kontakter",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Indlæser kontakter...",
       "404": "Ingen kontakter matcher din søgning 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/da/contactFilters.json b/app/javascript/dashboard/i18n/locale/da/contactFilters.json
index 37dbe87e1..082354cde 100644
--- a/app/javascript/dashboard/i18n/locale/da/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/da/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Navn",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefonnummer",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Brugerdefinerede Egenskaber"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 1e56a691f..c34fa45dd 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Indlæser Samtaler",
     "CANNOT_REPLY": "Du kan ikke svare på grund af",
     "24_HOURS_WINDOW": "24 timers beskedvindue begrænsning",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 timers beskedvindue begrænsning",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Fjern",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 23375a354..9f4a1b382 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Antal dage efter en ticket skal løses automatisk, hvis der ikke er nogen aktivitet",
         "PLACEHOLDER": "30",
-        "ERROR": "Angiv en gyldig varighed for automatisk løsning af sag (minimum 1 dag)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samtale kontinuitet med e-mails er aktiveret for din konto.",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 48c9167e4..361cb9a9f 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Aktivér kanal start hilsen",
-          "HELP_TEXT": "Send en hilsen til brugeren, når han starter samtalen.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Aktiveret",
           "DISABLED": "Deaktiveret"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Dette felt er påkrævet"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Dette felt er påkrævet"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Dette felt er påkrævet"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Dette felt er påkrævet"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Indbakke Navn",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Dette felt er påkrævet"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefonnummer",
+            "PLACEHOLDER": "Indtast venligst det telefonnummer, hvorfra beskeden vil blive sendt.",
+            "ERROR": "Angiv en gyldig værdi. Telefonnummer skal starte med `+` tegn."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Aktiveret",
         "DISABLED": "Deaktiveret"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Aktiveret",
+        "DISABLED": "Deaktiveret"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Aktiveret",
+        "DISABLED": "Deaktiveret"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Aktiver automatisk tildeling",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Indbakke Indstillinger",
       "INBOX_UPDATE_SUB_TEXT": "Opdater dine indbakkeindstillinger",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktiver eller deaktiver automatisk tildeling af nye samtaler til agenter tilføjet til denne indbakke.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Begynd at videresende dine e-mails til følgende e-mailadresse."
+      "FORWARD_EMAIL_SUB_TEXT": "Begynd at videresende dine e-mails til følgende e-mailadresse.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Genautorisér",
diff --git a/app/javascript/dashboard/i18n/locale/da/index.js b/app/javascript/dashboard/i18n/locale/da/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/da/index.js
+++ b/app/javascript/dashboard/i18n/locale/da/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 033cca2f6..27a8e1a88 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Adgangskode",
+        "LABEL": "New password",
         "ERROR": "Indtast en adgangskode med længde 6 eller flere",
         "PLACEHOLDER": "Indtast venligst en ny adgangskode"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Bekræft ny adgangskode",
         "ERROR": "Bekræftelses adgangskoden skal matche adgangskoden",
-        "PLACEHOLDER": "Indtast venligst din adgangskode igen"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Brugerdefinerede Egenskaber",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/da/teamsSettings.json b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
index 2609e8d52..e40300b20 100644
--- a/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/de/advancedFilters.json b/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
index c2daaf917..56001486c 100644
--- a/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
@@ -19,19 +19,68 @@
       "contains": "Enthält",
       "does_not_contain": "Beinhaltet nicht",
       "is_present": "Ist anwesend",
-      "is_not_present": "Ist nicht anwesend"
+      "is_not_present": "Ist nicht anwesend",
+      "is_greater_than": "Ist größer als",
+      "is_lesser_than": "Ist kleiner als"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
       "ASSIGNEE_NAME": "Name des Bevollmächtigten",
-      "INBOX_NAME": "Posteingang-Name",
+      "INBOX_NAME": "Posteingangsname",
       "TEAM_NAME": "Teamname",
       "CONVERSATION_IDENTIFIER": "Gesprächsidentifikation",
       "CAMPAIGN_NAME": "Kampagnenname",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browsersprache",
       "COUNTRY_NAME": "Ländername",
-      "REFERER_LINK": "Referrer-Link"
+      "REFERER_LINK": "Referer-Link",
+      "CUSTOM_ATTRIBUTE_LIST": "Liste",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Nummer",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standardfilter",
+      "ADDITIONAL_FILTERS": "Zusätzliche Filter",
+      "CUSTOM_ATTRIBUTES": "Benutzerdefinierte Attribute"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Möchten Sie diesen Filter speichern?",
+        "LABEL": "Diesen Filter benennen",
+        "PLACEHOLDER": "Geben Sie einen Namen für diesen Filter ein",
+        "ERROR_MESSAGE": "Name wird benötigt",
+        "SAVE_BUTTON": "Filter speichern",
+        "CANCEL_BUTTON": "Stornieren",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Ordner erfolgreich erstellt",
+          "ERROR_MESSAGE": "Fehler beim Erstellen des Ordners"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment erfolgreich erstellt",
+          "ERROR_MESSAGE": "Fehler beim Erstellen des Segments"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Filter löschen",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Löschung bestätigen",
+            "MESSAGE": "Möchten Sie den Filter wirklich löschen ",
+            "YES": "Ja, löschen",
+            "NO": "Nein, behalte es"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Ordner erfolgreich gelöscht",
+          "ERROR_MESSAGE": "Fehler beim Löschen des Ordners"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment erfolgreich gelöscht",
+          "ERROR_MESSAGE": "Fehler beim Löschen des Segments"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
index bf49a2beb..f6bdf07eb 100644
--- a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
@@ -13,7 +13,7 @@
       "TITLE": "Verwalten Sie Agenten in Ihrem Team",
       "DESC": "Sie können Agenten zu / in Ihrem Team hinzufügen / entfernen.",
       "NAME": "Name",
-      "EMAIL": "E-Mail",
+      "EMAIL": "EMAIL",
       "STATUS": "Status",
       "ACTIONS": "Aktionen",
       "VERIFIED": "Verifiziert",
diff --git a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
index e41ba28e0..821ca531f 100644
--- a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
@@ -21,12 +21,12 @@
         },
         "MODEL": {
           "LABEL": "Gilt für",
-          "PLACEHOLDER": "Bitte wählen Sie eine aus",
+          "PLACEHOLDER": "Bitte auswählen",
           "ERROR": "Modell wird benötigt"
         },
         "TYPE": {
           "LABEL": "Typ",
-          "PLACEHOLDER": "Bitte wählen Sie einen Typ",
+          "PLACEHOLDER": "Bitte Typ wählen",
           "ERROR": "Typ wird benötigt",
           "LIST": {
             "LABEL": "Listenwerte",
diff --git a/app/javascript/dashboard/i18n/locale/de/automation.json b/app/javascript/dashboard/i18n/locale/de/automation.json
index 0450acafa..d81e487e1 100644
--- a/app/javascript/dashboard/i18n/locale/de/automation.json
+++ b/app/javascript/dashboard/i18n/locale/de/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automatisierung",
-    "HEADER_BTN_TXT": "Automatisierungsregel hinzufügen"
+    "HEADER_BTN_TXT": "Automatisierungsregel hinzufügen",
+    "LOADING": "Automatisierungsregeln abrufen",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Automatisierungsregel hinzufügen",
+      "SUBMIT": "Erstellen",
+      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Regelname",
+          "PLACEHOLDER": "Regelnamen eingeben",
+          "ERROR": "Name wird benötigt"
+        },
+        "DESC": {
+          "LABEL": "Beschreibung",
+          "PLACEHOLDER": "Regelbeschreibung eingeben",
+          "ERROR": "Beschreibung wird benötigt"
+        },
+        "EVENT": {
+          "LABEL": "Ereignis",
+          "PLACEHOLDER": "Bitte auswählen",
+          "ERROR": "Ereignis ist erforderlich"
+        },
+        "CONDITIONS": {
+          "LABEL": "Bedingungen"
+        },
+        "ACTIONS": {
+          "LABEL": "Aktionen"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Bedingung hinzufügen",
+      "ACTION_BUTTON_LABEL": "Aktion hinzufügen",
+      "API": {
+        "SUCCESS_MESSAGE": "Automatisierungsregel erfolgreich hinzugefügt",
+        "ERROR_MESSAGE": "Automatisierungsregel konnte nicht erstellt werden. Bitte versuchen Sie es später erneut"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Beschreibung",
+        "Aktiv",
+        "Erstellt am"
+      ],
+      "404": "Keine Automatisierungsregeln gefunden"
+    },
+    "DELETE": {
+      "TITLE": "Automatisierungsregel löschen",
+      "SUBMIT": "Löschen",
+      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "CONFIRM": {
+        "TITLE": "Löschung bestätigen",
+        "MESSAGE": "Bist du sicher, das du das löschen möchtest?",
+        "YES": "Ja, löschen ",
+        "NO": "Nein, behalten "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automatisierungsregel erfolgreich gelöscht",
+        "ERROR_MESSAGE": "Eine Automatisierungsregel konnte nicht gelöscht werden. Bitte versuchen Sie es später erneut"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Automatisierungsregel bearbeiten",
+      "SUBMIT": "Bearbeiten",
+      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "API": {
+        "SUCCESS_MESSAGE": "Automatisierungsregel erfolgreich aktualisiert",
+        "ERROR_MESSAGE": "Die Automatisierungsregel konnte nicht aktualisiert werden. Bitte versuchen Sie es später erneut"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Klonen",
+      "API": {
+        "SUCCESS_MESSAGE": "Automatisierung erfolgreich geklont",
+        "ERROR_MESSAGE": "Die Automatisierungsregel konnte nicht geklont werden. Bitte später erneut versuchen"
+      }
+    },
+    "FORM": {
+      "EDIT": "Bearbeiten",
+      "CREATE": "Erstellen",
+      "DELETE": "Löschen",
+      "CANCEL": "Stornieren",
+      "RESET_MESSAGE": "Durch das Ändern des Ereignistyps werden die unten hinzugefügten Bedingungen und Ereignisse zurückgesetzt"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/campaign.json b/app/javascript/dashboard/i18n/locale/de/campaign.json
index 644343bbd..47025b1fb 100644
--- a/app/javascript/dashboard/i18n/locale/de/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/de/campaign.json
@@ -104,7 +104,7 @@
       },
       "STATUS": {
         "ENABLED": "Aktiviert",
-        "DISABLED": "Inaktiv",
+        "DISABLED": "Deaktiviert",
         "COMPLETED": "Erledigt",
         "ACTIVE": "Aktiv"
       },
diff --git a/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
index c900a8e5c..9c989c6cb 100644
--- a/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Vorgefertigte Antwort hinzufügen",
     "LOADING": "Vorgefertigte Antworten abrufen",
     "SEARCH_404": "Es gibt keine Elemente, die dieser Abfrage entsprechen",
-    "SIDEBAR_TXT": "<p> <b> Vorgefertigte Antworten </b> </p> <p> Vorgefertigte Antworten sind gespeicherte Antwortvorlagen, mit denen schnell eine Antwort auf eine Konversation gesendet werden kann. </p> <p> Um eine vordefinierte Antwort zu erstellen, klicken Sie einfach auf <b> vordefinierte Antwort hinzufügen </b>. Sie können eine vorhandene gespeicherte Antwort auch bearbeiten oder löschen, indem Sie auf die Schaltfläche Bearbeiten oder Löschen klicken. </p> <p> Gespeicherte Antworten werden mithilfe von <b> Funktionscodes </b> verwendet. Agenten können während eines Chats auf vordefinierte Antworten zugreifen, indem sie <b> '/' </b> gefolgt vom Funktionscode eingeben. </p>",
+    "SIDEBAR_TXT": "<p><b>Vorgefertigte Antworten</b></p><p>Vorgefertigte Antworten sind gespeicherte Vorlagen, die zum schnellen Versenden von Antworten in Konversationen verwendet werden können.</p><p>Um eine vorgefertigte Antwort zu erstellen, klicken Sie einfach auf die Schaltfläche <b>Vorgefertigte Antwort hinzufügen</b>. Sie können auch eine vorhandene gespeicherte Antwort bearbeiten oder löschen, indem Sie auf die Schaltfläche Bearbeiten oder Löschen klicken.</p><p>Vorgefertigte Antworten werden mit Hilfe von Kurzcode verwendet. Agenten können während eines Chats auf vorgefertigte Antworten zugreifen, indem sie einen Schrägstrich <b>'/'</b> gefolgt von dem Kurzcode eingeben.</p>",
     "LIST": {
       "404": "In diesem Konto sind keine gespeicherten Antworten verfügbar.",
       "TITLE": "Verwalten Sie vordefinierte Antworten",
@@ -17,7 +17,7 @@
     },
     "ADD": {
       "TITLE": "Vorgefertigte Antwort hinzufügen",
-      "DESC": "Gespeicherte Antworten sind gespeicherte Antwortvorlagen, mit denen schnell Antworten auf Konversationen gesendet werden können.",
+      "DESC": "Vorgefertigte Antworten sind Vorlagen, die zum schnellen Versenden von Antworten in Konversationen verwendet werden können.",
       "CANCEL_BUTTON_TEXT": "Abbrechen",
       "FORM": {
         "SHORT_CODE": {
diff --git a/app/javascript/dashboard/i18n/locale/de/chatlist.json b/app/javascript/dashboard/i18n/locale/de/chatlist.json
index d63fa7fc9..9fb10507d 100644
--- a/app/javascript/dashboard/i18n/locale/de/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/de/chatlist.json
@@ -4,7 +4,7 @@
     "LOAD_MORE_CONVERSATIONS": "Laden Sie weitere Gespräche",
     "EOF": "Alle Gespräche geladen 🎉",
     "LIST": {
-      "404": "In dieser Gruppe gibt es keine aktiven Gespräche."
+      "404": "In dieser Gruppe existieren keine aktiven Gespräche."
     },
     "TAB_HEADING": "Gespräche",
     "MENTION_HEADING": "Erwähnungen",
@@ -41,7 +41,7 @@
     ],
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
-        "TEXT": "Offen"
+        "TEXT": "Öffnen"
       },
       "resolved": {
         "TEXT": "Gelöst"
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 9319e447c..6d4afebe3 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -24,11 +24,11 @@
         "ERROR": "Labels konnten nicht aktualisiert werden"
       },
       "CONVERSATION": {
-        "TITLE": "Konversationsetiketten",
+        "TITLE": "Konversationslabels",
         "ADD_BUTTON": "Label hinzufügen"
       },
       "LABEL_SELECT": {
-        "TITLE": "Label hinzufügen",
+        "TITLE": "Labels hinzufügen",
         "PLACEHOLDER": "Labels suchen",
         "NO_RESULT": "Keine Labels gefunden"
       }
@@ -36,7 +36,7 @@
     "MERGE_CONTACT": "Kontakte zusammenführen",
     "CONTACT_ACTIONS": "Kontakt-Aktionen",
     "MUTE_CONTACT": "Unterhaltung stummschalten",
-    "UNMUTE_CONTACT": "Unterhaltung entmuten",
+    "UNMUTE_CONTACT": "Unterhaltung entstummen",
     "MUTED_SUCCESS": "Diese Unterhaltung ist für 6 Stunden auf stumm schalten",
     "UNMUTED_SUCCESS": "Diese Unterhaltung ist nicht mehr stumm geschaltet",
     "SEND_TRANSCRIPT": "Transkript senden",
@@ -77,7 +77,7 @@
     "CONFIRM": {
       "TITLE": "Löschung bestätigen",
       "MESSAGE": "Bist du sicher, das du das löschen möchtest?",
-      "PLACE_HOLDER": "Bitte geben Sie {contactName} zur Bestätigung ein",
+      "PLACE_HOLDER": "Bitte {contactName} zur Bestätigung eingeben",
       "YES": "Ja, löschen ",
       "NO": "Nein, behalten "
     },
@@ -88,7 +88,7 @@
   },
   "CONTACT_FORM": {
     "FORM": {
-      "SUBMIT": "Speichern",
+      "SUBMIT": "Einreichen",
       "CANCEL": "Abbrechen",
       "AVATAR": {
         "LABEL": "Kontaktbild"
@@ -103,7 +103,7 @@
       },
       "EMAIL_ADDRESS": {
         "PLACEHOLDER": "Geben Sie die E-Mail-Adresse des Kontakts ein",
-        "LABEL": "E-Mail-Addresse",
+        "LABEL": "E-Mail-Adresse",
         "DUPLICATE": "Diese E-Mail-Adresse wird bereits für einen anderen Kontakt verwendet."
       },
       "PHONE_NUMBER": {
@@ -114,7 +114,7 @@
         "DUPLICATE": "Diese Telefonnummer wird für einen anderen Kontakt verwendet."
       },
       "LOCATION": {
-        "PLACEHOLDER": "Geben Sie den Standort des Kontakts ein",
+        "PLACEHOLDER": "Standort des Kontakts eingeben",
         "LABEL": "Ort"
       },
       "COMPANY_NAME": {
@@ -135,7 +135,7 @@
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Gitub-Benutzernamen eingeben",
+          "PLACEHOLDER": "GitHub-Benutzernamen eingeben",
           "LABEL": "Github"
         }
       }
@@ -169,6 +169,7 @@
       "SUBMIT": "Nachricht senden",
       "CANCEL": "Abbrechen",
       "SUCCESS_MESSAGE": "Nachricht gesendet!",
+      "GO_TO_CONVERSATION": "Aussicht",
       "ERROR_MESSAGE": "Senden fehlgeschlagen! Bitte erneut versuchen"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Suchen",
     "SEARCH_INPUT_PLACEHOLDER": "Suche nach Kontakten",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Filter speichern",
+    "FILTER_CONTACTS_DELETE": "Filter löschen",
     "LIST": {
       "LOADING_MESSAGE": "Kontakte werden geladen...",
       "404": "Keine Kontakte entsprechend Deiner Suche gefunden 🔍",
@@ -189,9 +192,9 @@
         "LAST_ACTIVITY": "Letzte Aktivität",
         "COUNTRY": "Land",
         "CITY": "Stadt",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "SOCIAL_PROFILES": "Profile in sozialen Netzwerken",
         "COMPANY": "Firma",
-        "EMAIL_ADDRESS": "E-Mail-Addresse"
+        "EMAIL_ADDRESS": "E-Mail-Adresse"
       },
       "VIEW_DETAILS": "Details anzeigen"
     }
@@ -233,7 +236,7 @@
       "TITLE": "Aktivitäten"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notizen",
+      "PILL_BUTTON_NOTES": "Notizen",
       "PILL_BUTTON_EVENTS": "Veranstaltungen",
       "PILL_BUTTON_CONVO": "gespräche"
     }
diff --git a/app/javascript/dashboard/i18n/locale/de/contactFilters.json b/app/javascript/dashboard/i18n/locale/de/contactFilters.json
index d3921f946..ce81b879f 100644
--- a/app/javascript/dashboard/i18n/locale/de/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/de/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Enthält",
             "does_not_contain": "Beinhaltet nicht",
             "is_present": "Ist anwesend",
-            "is_not_present": "Ist nicht anwesend"
+            "is_not_present": "Ist nicht anwesend",
+            "is_greater_than": "Ist größer als",
+            "is_lesser_than": "Ist kleiner als"
         },
         "ATTRIBUTES": {
             "NAME": "Name",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefonnummer",
             "IDENTIFIER": "Identifizierer",
             "CITY": "Stadt",
-            "COUNTRY": "Land"
+            "COUNTRY": "Land",
+            "CUSTOM_ATTRIBUTE_LIST": "Liste",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Nummer",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standardfilter",
+            "ADDITIONAL_FILTERS": "Zusätzliche Filter",
+            "CUSTOM_ATTRIBUTES": "Benutzerdefinierte Attribute"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 65d26646e..5d26d9bd3 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -1,13 +1,13 @@
 {
   "CONVERSATION": {
     "404": "Bitte wählen Sie eine Konversation aus dem linken Bereich",
-    "UNVERIFIED_SESSION": "Die Identität dieses Benutzers wird nicht überprüft",
+    "UNVERIFIED_SESSION": "Die Identität dieses Benutzers ist nicht verifiziert",
     "NO_MESSAGE_1": "Oh oh! Anscheinend befinden sich keine Nachrichten von Kunden in Ihrem Posteingang.",
     "NO_MESSAGE_2": "um eine Nachricht an Ihre Seite zu senden!",
     "NO_INBOX_1": "Hallo! Sieht so aus, als hätten Sie noch keine Posteingänge hinzugefügt.",
     "NO_INBOX_2": " um loszulegen",
     "NO_INBOX_AGENT": "Oh oh! Sieht so aus, als wären Sie nicht Teil eines Posteingangs. Bitte wenden Sie sich an Ihren Administrator",
-    "SEARCH_MESSAGES": "Nachrichten durchsuchen",
+    "SEARCH_MESSAGES": "Nachrichten in Unterhaltungen suchen",
     "SEARCH": {
       "TITLE": "Nachrichten durchsuchen",
       "RESULT_TITLE": "Suchergebnisse",
@@ -22,22 +22,24 @@
     "LOADING_CONVERSATIONS": "Gespräche laden",
     "CANNOT_REPLY": "Du kannst nicht Antworten aufgrund von",
     "24_HOURS_WINDOW": "24-Stunden-Nachrichtenfenster-Beschränkung",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Mir zuweisen",
     "TWILIO_WHATSAPP_CAN_REPLY": "Du kannst auf diese Unterhaltung nur mit einer Vorlagen-Nachricht antworten aufgrund von",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24-Stunden-Nachrichtenfenster-Beschränkung",
     "SELECT_A_TWEET_TO_REPLY": "Bitte wählen Sie einen Tweet aus, auf welchen Sie antworten möchten.",
-    "REPLYING_TO": "Du antwortest auf:",
+    "REPLYING_TO": "Sie antworten auf:",
     "REMOVE_SELECTION": "Auswahl entfernen",
     "DOWNLOAD": "Herunterladen",
     "UPLOADING_ATTACHMENTS": "Anhänge werden hochgeladen...",
     "SUCCESS_DELETE_MESSAGE": "Nachricht erfolgreich gelöscht",
-    "FAIL_DELETE_MESSSAGE": "Nachricht konnte nicht gelöscht werden! Versuche es erneut",
+    "FAIL_DELETE_MESSSAGE": "Nachricht konnte nicht gelöscht werden! Versuchen Sie es erneut",
     "NO_RESPONSE": "Keine Antwort",
     "RATING_TITLE": "Bewertung",
     "FEEDBACK_TITLE": "Feedback",
     "HEADER": {
       "RESOLVE_ACTION": "Fall schließen",
       "REOPEN_ACTION": "Wieder öffnen",
-      "OPEN_ACTION": "Offen",
+      "OPEN_ACTION": "Öffnen",
       "OPEN": "Mehr",
       "CLOSE": "Schließen",
       "DETAILS": "Einzelheiten",
@@ -48,7 +50,7 @@
     "RESOLVE_DROPDOWN": {
       "MARK_PENDING": "Als ausstehend markieren",
       "SNOOZE": {
-        "TITLE": "Erinnern",
+        "TITLE": "Schlummern bis",
         "NEXT_REPLY": "Bei Antwort",
         "TOMORROW": "Morgen",
         "NEXT_WEEK": "Nächste Woche"
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Die Datei überschreitet das Limit von {MAXIMUM_FILE_UPLOAD_SIZE} für Anhänge",
     "MESSAGE_ERROR": "Nachricht konnte nicht gesendet werden, bitte versuchen Sie es später erneut",
     "SENT_BY": "Gesendet von:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Nachricht konnte nicht gesendet werden! Versuchen Sie es noch einmal",
+    "TRY_AGAIN": "neu versuchen",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Agent auswählen",
       "REMOVE": "Entfernen",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Laden Sie Ihre Teammitglieder ein",
-      "DESCRIPTION": "Du bist nun bereit, mit deinen Kunden zu kommunizieren. Besorge dir nun Unterstützung. Du kannst deine Teamkollegen einladen, indem du die E-Mail-Adresse der Agentenliste hinzufügst.",
+      "DESCRIPTION": "Da Sie sich darauf vorbereiten, mit Ihrem Kunden zu sprechen, ziehen Sie Ihre Teamkollegen hinzu, um Ihnen zu helfen. Sie können Ihre Teamkollegen einladen, indem Sie deren E-Mail-Adressen zur Agentenliste hinzufügen.",
       "NEW_LINK": "Klicke hier, um ein Teammitglied einzuladen"
     },
     "INBOXES": {
@@ -151,7 +156,7 @@
     "ACCORDION": {
       "CONTACT_DETAILS": "Kontakt-Details",
       "CONVERSATION_ACTIONS": "Aktionen für Unterhaltung",
-      "CONVERSATION_LABELS": "Konversationsetiketten",
+      "CONVERSATION_LABELS": "Konversationslabels",
       "CONVERSATION_INFO": "Informationen über Unterhaltung",
       "CONTACT_ATTRIBUTES": "Kontakt-Attribute",
       "PREVIOUS_CONVERSATION": "Vorherige Gespräche"
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index cf69f6e1b..6cc2c208b 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Anzahl der Tage, nach denen ein Ticket automatisch geschlossen wird, wenn keine Aktivität erfolgt",
         "PLACEHOLDER": "30",
-        "ERROR": "Bitte gebe eine gültige automatische Auflösungsdauer ein (mindestens 1 Tag)"
+        "ERROR": "Bitte gebe eine gültige automatische Auflösungsdauer ein (mindestens 1 Tag und maximal 999 Tage)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Für dein Konto wurde der Empfang von E-Mails aktiviert.",
@@ -97,7 +97,7 @@
       "SETTINGS": "die Einstellungen"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Gehe zur Konversationsübersicht",
+      "GO_TO_CONVERSATION_DASHBOARD": "Zur Konversationsübersicht gehen",
       "GO_TO_CONTACTS_DASHBOARD": "Zur Kontaktübersicht",
       "GO_TO_REPORTS_OVERVIEW": "Zur Berichtsübersicht",
       "GO_TO_AGENT_REPORTS": "Zu den Agentenberichten",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 397677b98..fa24cb9d8 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -49,7 +49,7 @@
         "HELP": "Um Ihr Twitter-Profil als Kanal hinzuzufügen, müssen Sie Ihr Twitter-Profil authentifizieren, indem Sie auf 'Mit Twitter anmelden' klicken.",
         "ERROR_MESSAGE": "Beim Verbinden mit Twitter ist ein Fehler aufgetreten, bitte versuchen Sie es erneut",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Konversationen aus erwähnten Tweets erstellen"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Kanal Begrüßung aktivieren",
-          "HELP_TEXT": "Senden Sie eine Grußnachricht an den Benutzer, wenn er die Unterhaltung beginnt.",
+          "HELP_TEXT": "Senden Sie eine Begrüßungsnachricht an die Benutzer, wenn sie das Gespräch beginnen.",
           "ENABLED": "Aktiviert",
           "DISABLED": "Deaktiviert"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS-Kanal über Twilio",
-        "DESC": "Unterstützen Sie Ihre Kunden per SMS mit Twilio-Integration."
+        "TITLE": "SMS Kanal",
+        "DESC": "Beginnen Sie, Ihre Kunden per SMS zu unterstützen.",
+        "PROVIDERS": {
+          "LABEL": "API-Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandbreite"
+        },
+        "API": {
+          "ERROR_MESSAGE": "Wir konnten den SMS-Kanal nicht speichern"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Bitte geben Sie Ihre Bandbreitenkonto-ID ein",
+            "ERROR": "Dieses Feld wird benötigt"
+          },
+          "API_KEY": {
+            "LABEL": "API-Schlüssel",
+            "PLACEHOLDER": "Bitte geben Sie Ihren Bandbreiten-API-Schlüssel ein",
+            "ERROR": "Dieses Feld wird benötigt"
+          },
+          "API_SECRET": {
+            "LABEL": "API-Secret",
+            "PLACEHOLDER": "Bitte geben Sie Ihr Bandbreiten-API-Secret ein",
+            "ERROR": "Dieses Feld wird benötigt"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Anwendungs-ID",
+            "PLACEHOLDER": "Bitte geben Sie Ihre Bandbreitenanwendungs-ID ein",
+            "ERROR": "Dieses Feld wird benötigt"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Posteingang-Name",
+            "PLACEHOLDER": "Bitte geben Sie einen Namen für den Posteingang ein",
+            "ERROR": "Dieses Feld wird benötigt"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefonnummer",
+            "PLACEHOLDER": "Bitte geben Sie die Telefonnummer ein, von der die Nachricht gesendet wird.",
+            "ERROR": "Bitte geben sie einen gültigen Wert ein. Die Telefonnummer sollte mit dem Pluszeichen beginnen."
+          },
+          "SUBMIT_BUTTON": "Bitte geben Sie Ihre Bandbreitenanwendungs-ID ein",
+          "API": {
+            "ERROR_MESSAGE": "Wir konnten die Bandbreiten-Anmeldeinformationen nicht authentifizieren. Bitte versuchen Sie es erneut"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "Sie müssen die Nachrichten-Callback-URL in Bandbreite mit der hier erwähnten URL konfigurieren."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp-Kanal",
@@ -305,6 +353,14 @@
         "ENABLED": "Aktiviert",
         "DISABLED": "Deaktiviert"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Aktiviert",
+        "DISABLED": "Deaktiviert"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Aktiviert",
+        "DISABLED": "Deaktiviert"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Aktivieren"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Aktivieren Sie die automatische Zuweisung",
       "ENABLE_CSAT": "CSAT aktivieren",
       "ENABLE_CSAT_SUB_TEXT": "CSAT(Kundenzufriedenheit) Umfrage aktivieren/deaktivieren nach Abschluss eines Gesprächs",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Konversationskontinuität per E-Mail aktivieren",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Posteingangseinstellungen",
       "INBOX_UPDATE_SUB_TEXT": "Posteingangseinstellungen aktualisieren",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivieren oder deaktivieren Sie die automatische Zuweisung verfügbarer Agenten für neue Konversationen",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Identifizierung für Posteingang",
       "INBOX_IDENTIFIER_SUB_TEXT": "Verwenden Sie den hier angezeigten `inbox_identifier`-Token zur Authentifizierung Ihrer API-Clients.",
       "FORWARD_EMAIL_TITLE": "Weiterleitung an E-Mail",
-      "FORWARD_EMAIL_SUB_TEXT": "Starten Sie die Weiterleitung Ihrer E-Mails an die folgende E-Mail-Adresse."
+      "FORWARD_EMAIL_SUB_TEXT": "Starten Sie die Weiterleitung Ihrer E-Mails an die folgende E-Mail-Adresse.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Erlaube Nachrichten nach aufgelösten Konversationen",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Den Endbenutzern erlauben, Nachrichten zu versenden, auch wenn die Unterhaltung abgeschlossen ist."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Neu autorisieren",
diff --git a/app/javascript/dashboard/i18n/locale/de/index.js b/app/javascript/dashboard/i18n/locale/de/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/de/index.js
+++ b/app/javascript/dashboard/i18n/locale/de/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index 2de48e7fc..6a0e3380f 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -68,7 +68,7 @@
     },
     "SLACK": {
       "HELP_TEXT": {
-        "TITLE": "Nutzung von Slack Integration",
+        "TITLE": "Slack-Integration verwenden",
         "BODY": "<br/><p>Chatwoot wird nun alle eingehenden Unterhaltungen in den <b><i>Kundengespräche</i></b> Channel innerhalb Ihres Slack Arbeitsplatzes synchronisieren.</p><p>Wenn Sie in <b><i>Kunden-Konversationen</i></b> antworten, wird der Slack Kanal eine Antwort an den Kunden durch Chat erzeugen.</p><p>Starten Sie die Antworten mit <b><i>Notiz:</i></b> um private Notizen anstatt Antworten zu erstellen.</p><p>Wenn der Replier auf Slack ein Agentenprofil im Chatwoot unter der gleichen E-Mail hat, werden die Antworten entsprechend assoziiert.</p><p>Wenn der Replier kein Agentenprofil hat, werden die Antworten aus dem Bot-Profil getätigt.</p>"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
index 690fc6ed1..34ccb6bd4 100644
--- a/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
@@ -33,7 +33,7 @@
       "SHOW_ON_SIDEBAR": {
         "LABEL": "Label in der Seitenleiste anzeigen"
       },
-      "EDIT": "Speichern",
+      "EDIT": "Bearbeiten",
       "CREATE": "Erstellen",
       "DELETE": "Löschen",
       "CANCEL": "Abbrechen"
@@ -61,7 +61,7 @@
       },
       "CONFIRM": {
         "TITLE": "Löschung bestätigen",
-        "MESSAGE": "Bist du sicher, das du das löschen möchtest",
+        "MESSAGE": "Bist du sicher, dass du das löschen möchtest ",
         "YES": "Ja, löschen",
         "NO": "Nein, behalten "
       }
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 79f0f0d8d..5d6afac1c 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -89,7 +89,7 @@
         "PLACEHOLDER": "Bitte geben Sie das aktuelle Passwort ein"
       },
       "PASSWORD": {
-        "LABEL": "Passwort",
+        "LABEL": "Passwort zurücksetzen",
         "ERROR": "Bitte geben Sie ein Passwort mit einer Länge von 6 oder mehr ein",
         "PLACEHOLDER": "Bitte geben Sie ein neues Passwort ein"
       },
@@ -127,7 +127,7 @@
       "SUBMIT": "Abschicken"
     }
   },
-  "CONFIRM_EMAIL": "Überprüft...",
+  "CONFIRM_EMAIL": "Überprüfen...",
   "SETTINGS": {
     "INBOXES": {
       "NEW_INBOX": "Posteingang hinzufügen"
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Benutzerdefinierte Attribute",
     "AUTOMATION": "Automatisierung",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Ordner",
+    "CUSTOM_VIEWS_SEGMENTS": "Segmente",
     "ALL_CONTACTS": "Alle Kontakte",
     "TAGGED_WITH": "Markiert mit",
     "NEW_LABEL": "Neues Label",
@@ -192,14 +194,14 @@
       "RESOLVE_AND_NEXT": "Lösen und zum Nächsten gehen",
       "NAVIGATE_DROPDOWN": "Dropdown-Elemente navigieren",
       "RESOLVE_CONVERSATION": "Unterhaltung als gelöst kennzeichnen",
-      "GO_TO_CONVERSATION_DASHBOARD": "Gehe zur Konversationsübersicht",
+      "GO_TO_CONVERSATION_DASHBOARD": "Zur Konversationsübersicht gehen",
       "ADD_ATTACHMENT": "Anhang hinzufügen",
       "GO_TO_CONTACTS_DASHBOARD": "Zur Kontaktübersicht",
       "TOGGLE_SIDEBAR": "Seitenleiste umschalten",
       "GO_TO_REPORTS_SIDEBAR": "Zur Berichtsseitenleiste",
       "MOVE_TO_NEXT_TAB": "Zum nächsten Tab in der Konversationsliste gehen",
       "GO_TO_SETTINGS": "Zu den Einstellungen",
-      "SWITCH_CONVERSATION_STATUS": "Zum nächsten Konversations-Status wechseln",
+      "SWITCH_CONVERSATION_STATUS": "Zum nächsten Gesprächsstatus wechseln",
       "SWITCH_TO_PRIVATE_NOTE": "Zu privaten Notizen wechseln",
       "TOGGLE_RICH_CONTENT_EDITOR": "Rich-Content-Editor umschalten",
       "SWITCH_TO_REPLY": "Zur Antwort wechseln",
diff --git a/app/javascript/dashboard/i18n/locale/de/teamsSettings.json b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
index a31b2449a..5c014e924 100644
--- a/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Neues Team erstellen",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams ermöglichen es Ihnen, Ihre Agenten auf der Grundlage ihrer Verantwortlichkeiten in Gruppen zu organisieren. <br /> Ein Benutzer kann Teil mehrerer Teams sein. Sie können einem Team Gespräche zuweisen, wenn Sie kooperativ arbeiten. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> Mit <p>Teams können Sie Ihre Agenten basierend auf ihren Verantwortlichkeiten in Gruppen organisieren. <br /> Ein Agent kann mehreren Teams angehören. Sie können Unterhaltungen einem Team zuweisen, wenn Sie zusammenarbeiten. </p>",
     "LIST": {
       "404": "Es wurden noch keine Teams auf diesem Konto erstellt.",
       "EDIT_TEAM": "Team bearbeiten"
@@ -68,18 +68,18 @@
       "ERROR_MESSAGE": "Teamdetails konnten nicht gespeichert werden. Versuchen Sie es erneut."
     },
     "AGENTS": {
-      "AGENT": "AGENT",
+      "AGENT": "Agent",
       "EMAIL": "E-Mail",
       "BUTTON_TEXT": "Agenten hinzufügen",
       "ADD_AGENTS": "Agenten zu Ihrem Team hinzufügen...",
-      "SELECT": "auswählen",
+      "SELECT": "Auswählen",
       "SELECT_ALL": "Alle Agenten auswählen",
       "SELECTED_COUNT": "%{selected} von %{total} Agenten ausgewählt."
     },
     "ADD": {
       "TITLE": "Agenten zum Team %{teamName} hinzufügen",
       "DESC": "Fügen Sie Agenten zu Ihrem neu erstellten Team hinzu. So können Sie bei Gesprächen als Team zusammenarbeiten und erhalten Benachrichtigungen über neue Ereignisse in der gleichen Unterhaltung.",
-      "SELECT": "auswählen",
+      "SELECT": "Auswählen",
       "SELECT_ALL": "Alle Agenten auswählen",
       "SELECTED_COUNT": "%{selected} von %{total} Agenten ausgewählt.",
       "BUTTON_TEXT": "Agenten hinzufügen",
diff --git a/app/javascript/dashboard/i18n/locale/el/advancedFilters.json b/app/javascript/dashboard/i18n/locale/el/advancedFilters.json
index 0f2d8c933..af125d495 100644
--- a/app/javascript/dashboard/i18n/locale/el/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/el/advancedFilters.json
@@ -1,37 +1,86 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "Φίλτρο Συνομιλιών",
+    "SUBTITLE": "Προσθέστε φίλτρα παρακάτω και πατήστε το 'Εφαρμογή φίλτρων' για να φιλτράρετε συνομιλίες.",
+    "ADD_NEW_FILTER": "Προσθήκη Φίλτρου",
+    "FILTER_DELETE_ERROR": "Θα πρέπει να έχετε τουλάχιστον ένα φίλτρο για την αποθήκευση",
+    "SUBMIT_BUTTON_LABEL": "Εφαρμογή φίλτρων",
     "CANCEL_BUTTON_LABEL": "Άκυρο",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "Εκκαθάριση Φίλτρων",
+    "EMPTY_VALUE_ERROR": "Απαιτείται τιμή",
+    "TOOLTIP_LABEL": "Φιλτράρισμα συνομιλιών",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "AND",
       "OR": "OR"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Equal to",
-      "not_equal_to": "Not equal to",
-      "contains": "Contains",
-      "does_not_contain": "Does not contain",
-      "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "equal_to": "Ίσο με",
+      "not_equal_to": "Όχι ίσο με",
+      "contains": "Περιέχει",
+      "does_not_contain": "Δεν περιέχει",
+      "is_present": "Υπάρχει",
+      "is_not_present": "Δεν υπάρχει",
+      "is_greater_than": "Είναι μεγαλύτερο από",
+      "is_lesser_than": "Είναι μικρότερο από"
     },
     "ATTRIBUTES": {
       "STATUS": "Κατάσταση",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Όνομα Εντεταλμένου",
       "INBOX_NAME": "Όνομα Κιβωτίου",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "Όνομα Ομάδας",
+      "CONVERSATION_IDENTIFIER": "Κωδικός Σινομιλίας",
+      "CAMPAIGN_NAME": "Όνομα Καμπάνιας",
       "LABELS": "Ετικέτες",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "BROWSER_LANGUAGE": "Γλώσσα Περιήγησης",
+      "COUNTRY_NAME": "Όνομα Χώρας",
+      "REFERER_LINK": "Σύνδεσμος αναφοράς",
+      "CUSTOM_ATTRIBUTE_LIST": "Λίστα",
+      "CUSTOM_ATTRIBUTE_TEXT": "Κείμενο",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Αριθμός",
+      "CUSTOM_ATTRIBUTE_LINK": "Σύνδεσμος",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Τυπικά Φίλτρα",
+      "ADDITIONAL_FILTERS": "Πρόσθετα Φίλτρα",
+      "CUSTOM_ATTRIBUTES": "Προσαρμοζόμενες Ιδιότητες"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Θέλετε να αποθηκεύσετε αυτό το φίλτρο;",
+        "LABEL": "Ονομάστε αυτό το φίλτρο",
+        "PLACEHOLDER": "Πληκτρολογήστε ένα όνομα για το φίλτρο",
+        "ERROR_MESSAGE": "Απαιτείται όνομα",
+        "SAVE_BUTTON": "Αποθήκευση φίλτρου",
+        "CANCEL_BUTTON": "Άκυρο",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Ο φάκελος δημιουργήθηκε με επιτυχία",
+          "ERROR_MESSAGE": "Σφάλμα κατά τη δημιουργία φακέλου"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Το τμήμα δημιουργήθηκε με επιτυχία",
+          "ERROR_MESSAGE": "Σφάλμα κατά τη δημιουργία τμήματος"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Διαγραφή φίλτρου",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Επιβεβαίωση Διαγραφής",
+            "MESSAGE": "Είστε βέβαιοι ότι θα διαγράψετε το φίλτρο ",
+            "YES": "Ναι, Διέγραψε το",
+            "NO": "Όχι, Κράτησε τον/την"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Ο φάκελος διαγράφηκε με επιτυχία",
+          "ERROR_MESSAGE": "Σφάλμα κατά τη διαγραφή του φακέλου"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Το τμήμα διαγράφηκε επιτυχώς",
+          "ERROR_MESSAGE": "Σφάλμα κατά τη διαγραφή τμήματος"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
index 56cc44338..78fdf1d3b 100644
--- a/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
@@ -1,27 +1,27 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "Προσαρμοζόμενες Ιδιότητες",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
-    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "HEADER_BTN_TXT": "Προσθήκη προσαρμοσμένης ιδιότητας",
+    "LOADING": "Λήψη προσαρμοσμένων ιδιοτήτων",
+    "SIDEBAR_TXT": "<p><b>Προσαρμοσμένες Ιδιότητες</b> <p>Μία προσαρμοσμένη ιδιότητα παρακολουθεί γεγονότα σχετικά με τις επαφές σας/συνομιλία σας — όπως το σχέδιο συνδρομής, ή όταν παραγγέλλουν το πρώτο αντικείμενο κ. λπ. <br /><br />Για τη δημιουργία μίας προσαρμοσμένης Ιδιότητας, απλά κάντε κλικ στο<b>Προσθήκη προσαρμοσμένης Ιδιότητας.</b> Μπορείτε επίσης να επεξεργαστείτε ή να διαγράψετε μια υπάρχουσα Προσαρμοσμένη Ιδιότητα κάνοντας κλικ στο κουμπί Επεξεργασία ή Διαγραφή.</p>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "Προσθήκη προσαρμοσμένης ιδιότητας",
       "SUBMIT": "Δημιουργία",
       "CANCEL_BUTTON_TEXT": "Άκυρο",
       "FORM": {
         "NAME": {
-          "LABEL": "Εμφανιζόμενο Όνομα",
-          "PLACEHOLDER": "Enter custom attribute display name",
-          "ERROR": "Το όνομα απαιτείται"
+          "LABEL": "Εμφανιζόμενο όνομα",
+          "PLACEHOLDER": "Εισάγετε το εμφανιζόμενο όνομα της ιδιότητας",
+          "ERROR": "Απαιτείται όνομα"
         },
         "DESC": {
           "LABEL": "Περιγραφή",
-          "PLACEHOLDER": "Enter custom attribute description",
+          "PLACEHOLDER": "Εισάγετε την περιγραφή της ιδιότητας",
           "ERROR": "Η περιγραφή απαιτείται"
         },
         "MODEL": {
-          "LABEL": "Applies to",
-          "PLACEHOLDER": "Please select one",
+          "LABEL": "Εφαρμόζεται σε",
+          "PLACEHOLDER": "Παρακαλώ επιλέξτε ένα",
           "ERROR": "Απαιτείται το μοντέλο"
         },
         "TYPE": {
@@ -29,49 +29,49 @@
           "PLACEHOLDER": "Παρακαλώ επιλέξτε ρόλο",
           "ERROR": "Ο τύπος απαιτείται",
           "LIST": {
-            "LABEL": "List Values",
-            "PLACEHOLDER": "Please enter value and press enter key",
-            "ERROR": "Must have at least one value"
+            "LABEL": "Λίστα Τιμών",
+            "PLACEHOLDER": "Παρακαλώ εισάγετε τιμή και πατήστε το πλήκτρο enter",
+            "ERROR": "Πρέπει να έχει τουλάχιστον μία τιμή"
           }
         },
         "KEY": {
           "LABEL": "Κλειδί",
-          "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "PLACEHOLDER": "Εισάγετε τον κωδικό της ιδιότητας",
+          "ERROR": "Ο Κωδικός απαιτείται",
+          "IN_VALID": "Μη έγκυρο κλειδί"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
-        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+        "SUCCESS_MESSAGE": "Η ιδιότητα προστέθηκε με επιτυχία",
+        "ERROR_MESSAGE": "Δεν ήταν δυνατή η δημιουργία Ιδιότητας, Παρακαλώ δοκιμάστε ξανά αργότερα"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Διαγραφή",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "SUCCESS_MESSAGE": "Η ιδιότητα διαγράφηκε επιτυχώς.",
+        "ERROR_MESSAGE": "Δεν ήταν δυνατή η διαγραφή της ιδιότητας. Δοκιμάστε ξανά."
       },
       "CONFIRM": {
         "TITLE": "Είστε σίγουροι ότι θέλετε να διαγράψετε την ομάδα %{attributeName}",
         "PLACE_HOLDER": "Παρακαλώ πληκτρολογήστε {attributeName} για επιβεβαίωση",
-        "MESSAGE": "Deleting will remove the custom attribute",
+        "MESSAGE": "Η Διαγραφή θα καταργήσει την ιδιότητα",
         "YES": "Διαγραφή ",
         "NO": "Άκυρο"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Custom Attribute",
+      "TITLE": "Επεξεργασία Προσαρμοσμένου Ιδιότητας",
       "UPDATE_BUTTON_TEXT": "Ενημέρωση",
       "TYPE": {
         "LIST": {
-          "LABEL": "List Values",
-          "PLACEHOLDER": "Please enter values and press enter key"
+          "LABEL": "Λίστα Τιμών",
+          "PLACEHOLDER": "Παρακαλώ εισάγετε τιμές και πατήστε το πλήκτρο enter"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
-        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+        "SUCCESS_MESSAGE": "Ο πράκτορας ενημερώθηκε επιτυχώς",
+        "ERROR_MESSAGE": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση της ιδιότητας, παρακαλώ προσπαθήστε ξανά"
       }
     },
     "TABS": {
@@ -91,8 +91,8 @@
         "DELETE": "Διαγραφή"
       },
       "EMPTY_RESULT": {
-        "404": "There are no custom attributes created",
-        "NOT_FOUND": "There are no custom attributes configured"
+        "404": "Δεν δημιουργήθηκαν προσαρμοζόμενες ιδιότητες",
+        "NOT_FOUND": "Δεν έχουν ρυθμιστεί προσαρμοζόμενες ιδιότητες"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/el/automation.json b/app/javascript/dashboard/i18n/locale/el/automation.json
index fc77b7c69..87511959f 100644
--- a/app/javascript/dashboard/i18n/locale/el/automation.json
+++ b/app/javascript/dashboard/i18n/locale/el/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Αυτοματισμός",
-    "HEADER_BTN_TXT": "Προσθήκη Κανόνα Αυτοματισμού"
+    "HEADER_BTN_TXT": "Προσθήκη Κανόνα Αυτοματισμού",
+    "LOADING": "Λήψη κανόνων αυτοματισμού",
+    "SIDEBAR_TXT": "<p><b>Κανόνες Αυτοματισμού</b> <p>Ο Αυτοματισμός μπορεί να αντικαταστήσει και να αυτοματοποιήσει διαδικασίες που απαιτούν χειροκίνητη προσπάθεια. Μπορείτε να κάνετε πολλά πράγματα με την αυτοματοποίηση, συμπεριλαμβανομένης της προσθήκης ετικετών και την ανάθεση συνομιλίας στον καλύτερο πράκτορα. Έτσι, η ομάδα επικεντρώνεται σε αυτό που κάνουν καλύτερα και ξοδεύει λίγο χρόνο για χειρωνακτικές εργασίες.</p>",
+    "ADD": {
+      "TITLE": "Προσθήκη Κανόνα Αυτοματισμού",
+      "SUBMIT": "Δημιουργία",
+      "CANCEL_BUTTON_TEXT": "Άκυρο",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Όνομα Κανόνα",
+          "PLACEHOLDER": "Εισάγετε όνομα κανόνα",
+          "ERROR": "Απαιτείται όνομα"
+        },
+        "DESC": {
+          "LABEL": "Περιγραφή",
+          "PLACEHOLDER": "Εισάγετε περιγραφή κανόνα",
+          "ERROR": "Η περιγραφή απαιτείται"
+        },
+        "EVENT": {
+          "LABEL": "Συμβάν",
+          "PLACEHOLDER": "Παρακαλώ επιλέξτε ένα",
+          "ERROR": "Απαιτείται συμβάν"
+        },
+        "CONDITIONS": {
+          "LABEL": "Προϋποθέσεις"
+        },
+        "ACTIONS": {
+          "LABEL": "Ενέργειες"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Προσθήκη Προϋπόθεσης",
+      "ACTION_BUTTON_LABEL": "Προσθήκη Ενέργειας",
+      "API": {
+        "SUCCESS_MESSAGE": "Ο κανόνας αυτοματισμού προστέθηκε με επιτυχία",
+        "ERROR_MESSAGE": "Δεν ήταν δυνατή η δημιουργία ενός κανόνα αυτοματισμού, Παρακαλώ δοκιμάστε ξανά αργότερα"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Όνομα",
+        "Περιγραφή",
+        "Ενεργή",
+        "Δημιουργήθηκε στις"
+      ],
+      "404": "Δεν βρέθηκαν κανόνες αυτοματισμού"
+    },
+    "DELETE": {
+      "TITLE": "Διαγραφή Κανόνα Αυτοματισμού",
+      "SUBMIT": "Διαγραφή",
+      "CANCEL_BUTTON_TEXT": "Άκυρο",
+      "CONFIRM": {
+        "TITLE": "Επιβεβαίωση Διαγραφής",
+        "MESSAGE": "Είσαστε σίγουροι για την διαγραφή ",
+        "YES": "Ναι, Διέγραψε τον/την ",
+        "NO": "Όχι, Κράτησε τον/την"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Ο κανόνας αυτοματισμού διαγράφηκε επιτυχώς",
+        "ERROR_MESSAGE": "Δεν ήταν δυνατή η διαγραφή του κανόνα αυτοματισμού, Παρακαλώ δοκιμάστε ξανά αργότερα"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Επεξεργασία Κανόνα Αυτοματισμού",
+      "SUBMIT": "Επεξεργασία",
+      "CANCEL_BUTTON_TEXT": "Άκυρο",
+      "API": {
+        "SUCCESS_MESSAGE": "Ο κανόνας αυτοματισμού ενημερώθηκε επιτυχώς",
+        "ERROR_MESSAGE": "Δεν ήταν δυνατή η ενημέρωση του κανόνα αυτοματισμού, Παρακαλώ προσπαθήστε ξανά αργότερα"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Κλώνος",
+      "API": {
+        "SUCCESS_MESSAGE": "Ο αυτοματισμός κλωνοποιήθηκε επιτυχώς",
+        "ERROR_MESSAGE": "Δεν ήταν δυνατή η κλωνοποίηση του κανόνα αυτοματισμού, Παρακαλώ δοκιμάστε ξανά αργότερα"
+      }
+    },
+    "FORM": {
+      "EDIT": "Επεξεργασία",
+      "CREATE": "Δημιουργία",
+      "DELETE": "Διαγραφή",
+      "CANCEL": "Άκυρο",
+      "RESET_MESSAGE": "Η αλλαγή τύπου συμβάντος θα επαναφέρει τις συνθήκες και τα συμβάντα που έχετε προσθέσει παρακάτω"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/el/cannedMgmt.json
index 857032ea6..f0cf6118b 100644
--- a/app/javascript/dashboard/i18n/locale/el/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Προσθήκη Έτοιμης Απάντησης",
     "LOADING": "Λήψη Έτοιμων Απαντήσεων",
     "SEARCH_404": "Δεν υπάρχουν αντικείμενα να ταιριάζουν με αυτό το ερώτημα",
-    "SIDEBAR_TXT": "<p><b>Έτοιμες Απαντήσεις</b> </p><p> Οι Έτοιμες Απαντήσεις είναι αποθηκευμένα πρότυπα απαντήσεων, τα οποία μπορούν να χρησιμοποιηθούν ως μια γρήργορη απάντηση σε μια συνομιλία. </p><p> Για την δημιουργία μιας Έτοιμης Απάντησης, απλώς πατήστε στο <b>Προσθήκη Έτοιμης Απάντησης</b>. Μπορείτε επίσης να επεξεργαστείτε ή να διαγράψετε μια έτοιμη απάντηση πατώντας το κουμπί Επεξεργασία ή Διαγραφή αντίστοιχα.</p><p> Οι έτοιμες απαντήσεις χρησιμοποιούνται με την βοήθεια του <b>Σύντομου Κώδικα</b>. Οι πράκτορες έχουν πρόσβαση στις Έτοιμες Απαντήσεις αν κατά την συνομιλία πληκτρολογήσουν <b>'/'</b> ακολουθούμενο από τον σύντομο κώδικα. </p>",
+    "SIDEBAR_TXT": "<p><b>Τυποποιημένες απαντήσεις</b> </p><p> Οι Τυποποιημένες απαντήσεις αποθηκεύονται πρότυπα απάντησης που μπορούν να χρησιμοποιηθούν για την γρήγορη αποστολή απάντησης σε μια συνομιλία. </p><p> Για τη δημιουργία μιας Αυτοματοποιημένης Απάντησης, απλά κάντε κλικ στο <b>Προσθήκη Αυτοματοποιημένης Απάντησης</b>. Μπορείτε επίσης να επεξεργαστείτε ή να διαγράψετε μια υπάρχουσα Αυτοματοποιημένη Απάντηση κάνοντας κλικ στο κουμπί Επεξεργασία ή Διαγραφή </p><p> Οι Τυποποιημένες απαντήσεις χρησιμοποιούνται με τη βοήθεια των <b>Σύντομοι Κώδικες</b>. Οι πράκτορες μπορούν να έχουν πρόσβαση σε τυποποιημένες απαντήσεις ενώ βρίσκονται σε μια συνομιλία πληκτρολογώντας <b>'/'</b> ακολουθούμενο από τον σύντομο κώδικα. </p>",
     "LIST": {
       "404": "Δεν υπάρχουν τυποποιημένες απαντήσεις σε αυτόν τον λογαριασμό.",
       "TITLE": "Διαχείριση έτοιμων απαντήσεων",
@@ -17,7 +17,7 @@
     },
     "ADD": {
       "TITLE": "Προσθήκη Έτοιμης Απάντησης",
-      "DESC": "Οι Έτοιμες Απαντήσεις είναι πρότυπα απαντήσεων με τα οποία μπορούμε να απαντήσουμε γρήγορα σε συνηθισμένα ερωτήματα.",
+      "DESC": "Οι Τυποποιημένες Απαντήσεις είναι πρότυπα απαντήσεων με τα οποία μπορούμε να απαντήσουμε γρήγορα σε συνηθισμένα ερωτήματα.",
       "CANCEL_BUTTON_TEXT": "Άκυρο",
       "FORM": {
         "SHORT_CODE": {
diff --git a/app/javascript/dashboard/i18n/locale/el/chatlist.json b/app/javascript/dashboard/i18n/locale/el/chatlist.json
index ddddc3f24..6170c2b42 100644
--- a/app/javascript/dashboard/i18n/locale/el/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/el/chatlist.json
@@ -7,7 +7,7 @@
       "404": "Δεν υπάρχουν ενεργές συζητήσεις σε αυτήν την ομάδα."
     },
     "TAB_HEADING": "Συζητήσεις",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "Αναφορές",
     "SEARCH": {
       "INPUT": "Αναζήτηση Ανθρώπων, συνομιλιών, αποθηκευμένων απαντήσεων .."
     },
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 42290b019..18858ab5b 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "Εταιρία",
     "LOCATION": "Θέση",
     "CONVERSATION_TITLE": "Λεπτομέρειες συνομιλίας",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "Προβολή Προφίλ",
     "BROWSER": "Φυλλομετρητής",
     "OS": "Λειτουργικό",
     "INITIATED_FROM": "Αρχικοποίηση από",
@@ -111,7 +111,7 @@
         "LABEL": "Αριθμός Τηλεφώνου",
         "HELP": "Ο αριθμός τηλεφώνου πρέπει να έχει μορφή E.164 π.χ.: +14155555 [+][κωδικός χώρας][κωδικός περιοχής][αριθμός τοπικού τηλεφώνου]",
         "ERROR": "Ο αριθμός τηλεφώνου πρέπει να είναι είτε άδειος είτε με μορφή E.164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "Αυτός ο αριθμός τηλεφώνου χρησιμοποιείται σε άλλη επαφή."
       },
       "LOCATION": {
         "PLACEHOLDER": "Εισάγετε την τοποθεσία της επαφής",
@@ -159,7 +159,7 @@
       "SUBJECT": {
         "LABEL": "Θέμα",
         "PLACEHOLDER": "Θέμα",
-        "ERROR": "Subject can't be empty"
+        "ERROR": "Το θέμα δεν μπορεί να είναι κενό"
       },
       "MESSAGE": {
         "LABEL": "Μήνυμα",
@@ -169,6 +169,7 @@
       "SUBMIT": "Αποστολή μηνύματος",
       "CANCEL": "Άκυρο",
       "SUCCESS_MESSAGE": "Το μήνυμα στάλθηκε!",
+      "GO_TO_CONVERSATION": "Προβολή",
       "ERROR_MESSAGE": "Αδυναμία αποστολής! Προσπαθήστε ξανά"
     }
   },
@@ -177,7 +178,9 @@
     "FIELDS": "Πεδία επαφής",
     "SEARCH_BUTTON": "Αναζήτηση",
     "SEARCH_INPUT_PLACEHOLDER": "Αναζήτηση Επαφών",
-    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS": "Φίλτρο",
+    "FILTER_CONTACTS_SAVE": "Αποθήκευση φίλτρου",
+    "FILTER_CONTACTS_DELETE": "Διαγραφή φίλτρου",
     "LIST": {
       "LOADING_MESSAGE": "Φόρτωση επαφών...",
       "404": "Δεν υπάρχουν επαφές που να αντιστοιχούν με την αναζήτησή σας 🔍",
@@ -198,7 +201,7 @@
   },
   "CONTACT_PROFILE": {
     "BACK_BUTTON": "Επαφές",
-    "LOADING": "Loading contact profile..."
+    "LOADING": "Φόρτωση προφίλ επαφής..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
@@ -211,13 +214,13 @@
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "Λήψη σημειώσεων...",
+    "NOT_AVAILABLE": "Δεν υπάρχουν σημειώσεις για αυτήν την επαφή",
     "HEADER": {
       "TITLE": "Σημειώσεις"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "προστέθηκε μια σημείωση"
     },
     "ADD": {
       "BUTTON": "Προσθήκη",
@@ -225,7 +228,7 @@
       "TITLE": "Shift + Enter για δημιουργία σημείωσης"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Διαγραφή σημείωσης"
     }
   },
   "EVENTS": {
@@ -239,13 +242,13 @@
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
+    "ADD_BUTTON_TEXT": "Προσθήκη ιδιότητας",
     "BUTTON": "Προσθήκη προσαρμοσμένης ιδιότητας",
     "NOT_AVAILABLE": "Δεν υπάρχουν διαθέσιμες προσαρμοσμένες ιδιότητες για αυτήν την επαφή.",
     "COPY_SUCCESSFUL": "Αντιγράφτηκε με επιτυχία στο πρόχειρο",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
+      "COPY": "Αντιγραφή ιδιότητας",
+      "DELETE": "Διαγραφή ιδιότητας",
       "EDIT": "Επεξεργασία ιδιότητας"
     },
     "ADD": {
@@ -265,34 +268,34 @@
         "PLACEHOLDER": "π.χ.: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
+        "TITLE": "Δημιουργία νέας ιδιότητας ",
         "SUCCESS": "Η ιδιότητα προστέθηκε με επιτυχία",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "ERROR": "Δεν ήταν δυνατή η δημιουργία Ιδιότητας, Παρακαλώ δοκιμάστε ξανά αργότερα"
       },
       "UPDATE": {
         "SUCCESS": "Ο πράκτορας ενημερώθηκε επιτυχώς",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "ERROR": "Δεν είναι δυνατή η ενημέρωση της ιδιότητας. Παρακαλώ προσπαθήστε ξανά αργότερα"
       },
       "DELETE": {
         "SUCCESS": "Η ιδιότητα προστέθηκε με επιτυχία",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "ERROR": "Δεν είναι δυνατή η διαγραφή της ιδιότητας. Παρακαλώ δοκιμάστε ξανά αργότερα"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "Προσθήκη ιδιότητας",
+        "PLACEHOLDER": "Αναζήτηση ιδιοτήτων",
+        "NO_RESULT": "Δεν βρέθηκαν ιδιότητες"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Επιλέξτε τιμή",
+          "SEARCH_INPUT_PLACEHOLDER": "Τιμή αναζήτησης",
+          "NO_RESULT": "Δεν βρέθηκε κανένα αποτέλεσμα"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Απαιτείται έγκυρη τιμή",
+      "INVALID_URL": "Μη Έγκυρο URL"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/el/contactFilters.json b/app/javascript/dashboard/i18n/locale/el/contactFilters.json
index 3f8ad6b1a..4555d290a 100644
--- a/app/javascript/dashboard/i18n/locale/el/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/el/contactFilters.json
@@ -1,34 +1,46 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "TITLE": "Φίλτρο Επαφών",
+        "SUBTITLE": "Προσθέστε φίλτρα παρακάτω και πατήστε 'Υποβολή' για να φιλτράρετε τις επαφές.",
+        "ADD_NEW_FILTER": "Προσθήκη Φίλτρου",
+        "CLEAR_ALL_FILTERS": "Εκκαθάριση Όλων Των Φίλτρων",
+        "FILTER_DELETE_ERROR": "Θα πρέπει να έχετε τουλάχιστον ένα φίλτρο για την αποθήκευση",
         "SUBMIT_BUTTON_LABEL": "Καταχώρηση",
         "CANCEL_BUTTON_LABEL": "Άκυρο",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "CLEAR_BUTTON_LABEL": "Εκκαθάριση Φίλτρων",
+        "EMPTY_VALUE_ERROR": "Απαιτείται τιμή",
+        "TOOLTIP_LABEL": "Φιλτράρισμα επαφών",
         "QUERY_DROPDOWN_LABELS": {
             "AND": "AND",
             "OR": "OR"
         },
         "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
-            "not_equal_to": "Not equal to",
-            "contains": "Contains",
-            "does_not_contain": "Does not contain",
-            "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "equal_to": "Ίσο με",
+            "not_equal_to": "Όχι ίσο με",
+            "contains": "Περιέχει",
+            "does_not_contain": "Δεν περιέχει",
+            "is_present": "Υπάρχει",
+            "is_not_present": "Δεν υπάρχει",
+            "is_greater_than": "Είναι μεγαλύτερο από",
+            "is_lesser_than": "Είναι μικρότερο από"
         },
         "ATTRIBUTES": {
             "NAME": "Όνομα",
             "EMAIL": "Email",
             "PHONE_NUMBER": "Αριθμός τηλεφώνου",
-            "IDENTIFIER": "Identifier",
+            "IDENTIFIER": "Κωδικός",
             "CITY": "Πόλη",
-            "COUNTRY": "Χώρα"
+            "COUNTRY": "Χώρα",
+            "CUSTOM_ATTRIBUTE_LIST": "Λίστα",
+            "CUSTOM_ATTRIBUTE_TEXT": "Κείμενο",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Αριθμός",
+            "CUSTOM_ATTRIBUTE_LINK": "Σύνδεσμος",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Τυπικά Φίλτρα",
+            "ADDITIONAL_FILTERS": "Πρόσθετα Φίλτρα",
+            "CUSTOM_ATTRIBUTES": "Προσαρμοζόμενες Ιδιότητες"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index d59babf41..5370ee19b 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Φόρτωση Συζητήσεων",
     "CANNOT_REPLY": "Δεν μπορείτε να απαντήσετε εξαιτίας",
     "24_HOURS_WINDOW": "του περιορισμού των 24 ωρών",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Ανάθεση σε μένα",
     "TWILIO_WHATSAPP_CAN_REPLY": "Μπορείτε να απαντήσετε μόνο σε αυτή τη συνομιλία χρησιμοποιώντας ένα πρότυπο μήνυμα επειδή",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "του περιορισμού των 24 ωρών",
     "SELECT_A_TWEET_TO_REPLY": "Παρακαλώ επιλέξτε ένα tweet για να απαντήσετε.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Το αρχείο υπερβαίνει το όριο συνημμένου {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Δεν είναι δυνατή η αποστολή του μηνύματος, παρακαλώ προσπαθήστε ξανά αργότερα",
     "SENT_BY": "Αποστολή από:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Δεν ήταν δυνατή η αποστολή μηνύματος! Προσπαθήστε ξανά",
+    "TRY_AGAIN": "επανάληψη",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Επιλογή πράκτορα",
       "REMOVE": "Διαγραφή",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Προσκαλέστε τα μέλη της ομάδας σας",
-      "DESCRIPTION": "Δεδομένου ότι ετοιμάζεστε να μιλήσετε με τον πελάτη σας, φέρτε τους συνάδελφους σας για να σας βοηθήσουν. Μπορείτε να προσκαλέσετε τους συνάδελφους σας προσθέτοντας τη διεύθυνση email τους στη λίστα αντιπροσώπων.",
+      "DESCRIPTION": "Δεδομένου ότι ετοιμάζεστε να συνομιλήσετε με τον πελάτη σας, φέρτε τους συνάδελφους σας για να σας βοηθήσουν. Μπορείτε να προσκαλέσετε τους συνάδελφους σας προσθέτοντας τη διεύθυνση email τους στη λίστα αντιπροσώπων.",
       "NEW_LINK": "Κάντε κλικ εδώ για να καλέσετε ένα μέλος της ομάδας"
     },
     "INBOXES": {
@@ -158,24 +163,24 @@
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Δημιουργία ιδιότητας",
     "UPDATE": {
       "SUCCESS": "Ο πράκτορας ενημερώθηκε επιτυχώς",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "ERROR": "Δεν είναι δυνατή η ενημέρωση της ιδιότητας. Παρακαλώ προσπαθήστε ξανά αργότερα"
     },
     "ADD": {
       "TITLE": "Προσθήκη",
       "SUCCESS": "Η ιδιότητα προστέθηκε με επιτυχία",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "ERROR": "Δεν ήταν δυνατή η δημιουργία Ιδιότητας, Παρακαλώ δοκιμάστε ξανά αργότερα"
     },
     "DELETE": {
       "SUCCESS": "Η ιδιότητα προστέθηκε με επιτυχία",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "ERROR": "Δεν είναι δυνατή η διαγραφή της ιδιότητας. Παρακαλώ δοκιμάστε ξανά αργότερα"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "Προσθήκη ιδιότητας",
+      "PLACEHOLDER": "Αναζήτηση ιδιοτήτων",
+      "NO_RESULT": "Δεν βρέθηκαν ιδιότητες"
     }
   },
   "EMAIL_HEADER": {
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index 532001dc5..be995d45b 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -14,8 +14,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "ID Λογαριασμού",
+        "NOTE": "Αυτό το ID απαιτείται αν δημιουργείτε μια ενσωμάτωση βασισμένη στο API"
       },
       "NAME": {
         "LABEL": "Ονομασία Λογαριασμού",
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Αριθμός ημερών μετά τις οποίες η συνομιλία θα επιλύεται αυτόματα, αν δεν υπάρχει δραστηριότητα",
         "PLACEHOLDER": "30",
-        "ERROR": "Παρακαλώ σημειώστε την περίοδο αυτόματης επίλυσης (ελάχιστο 1 ημέρα)"
+        "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διάρκεια αυτόματης επίλυσης (ελάχιστο 1 ημέρα και μέγιστο 999 ημέρες)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Η συνέχεια της συνομιλίας με emails έχει ενεργοποιηθεί για τον λογαριασμό.",
@@ -85,47 +85,47 @@
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "Αναζήτηση ή μετάβαση σε",
     "SECTIONS": {
-      "GENERAL": "General",
+      "GENERAL": "Γενικά",
       "REPORTS": "Αναφορές",
       "CONVERSATION": "Συνομιλία",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
+      "CHANGE_ASSIGNEE": "Αλλαγή Αναδόχου",
+      "CHANGE_TEAM": "Αλλαγή Ομάδας",
+      "ADD_LABEL": "Προσθήκη ετικέτας στη συνομιλία",
+      "REMOVE_LABEL": "Αφαίρεση ετικέτας από την συνομιλία",
       "SETTINGS": "Ρυθμίσεις"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Μεταβείτε στον Πίνακα Συνομιλίων",
       "GO_TO_CONTACTS_DASHBOARD": "Μετάβαση στον Πίνακα Επαφών",
-      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
-      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
-      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
-      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
-      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
-      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
-      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
-      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
-      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
-      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
-      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
-      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
-      "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow"
+      "GO_TO_REPORTS_OVERVIEW": "Μετάβαση στις Αναφορές",
+      "GO_TO_AGENT_REPORTS": "Μεταβείτε στις Αναφορές Πράκτορα",
+      "GO_TO_LABEL_REPORTS": "Μεταβείτε στις Αναφορές Ετικετών",
+      "GO_TO_INBOX_REPORTS": "Μεταβείτε στις Αναφορές Εισερχομένων",
+      "GO_TO_TEAM_REPORTS": "Μεταβείτε Αναφορές Ομάδας",
+      "GO_TO_SETTINGS_AGENTS": "Μεταβείτε στις Ρυθμίσεις Πράκτορα",
+      "GO_TO_SETTINGS_TEAMS": "Μεταβείτε στις ρυθμίσεις ομάδας",
+      "GO_TO_SETTINGS_INBOXES": "Μετάβαση στις Ρυθμίσεις Εισερχομένων",
+      "GO_TO_SETTINGS_LABELS": "Μεταβείτε στις Ρυθμίσεις Ετικετών",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Μεταβείτε στις ρυθμίσεις τυποποιημένων απαντήσεων",
+      "GO_TO_SETTINGS_APPLICATIONS": "Μετάβαση στις ρυθμίσεις εφαρμογής",
+      "GO_TO_SETTINGS_ACCOUNT": "Μεταβείτε στις ρυθμίσεις λογαριασμού",
+      "GO_TO_SETTINGS_PROFILE": "Μετάβαση στις ρυθμίσεις προφίλ",
+      "GO_TO_NOTIFICATIONS": "Μετάβαση στις ειδοποιήσεις",
+      "ADD_LABELS_TO_CONVERSATION": "Προσθήκη ετικέτας στη συνομιλία",
+      "ASSIGN_AN_AGENT": "Εκχώρηση πράκτορα",
+      "ASSIGN_A_TEAM": "Εκχώρηση ομάδας",
+      "MUTE_CONVERSATION": "Σίγαση Συνομιλίας",
+      "UNMUTE_CONVERSATION": "Επαναφορά Συνομιλίας",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Αφαίρεση ετικέτας από την συνομιλία",
+      "REOPEN_CONVERSATION": "Άνοιγμα συνομιλίας",
+      "RESOLVE_CONVERSATION": "Επίλυση Συνομιλίας",
+      "SEND_TRANSCRIPT": "Στείλτε μεταγραφή της συνομιλίας",
+      "SNOOZE_CONVERSATION": "Αναβολή Συνομιλίας",
+      "UNTIL_NEXT_REPLY": "Μέχρι την επόμενη απάντηση",
+      "UNTIL_NEXT_WEEK": "Έως την επόμενη εβδομάδα",
+      "UNTIL_TOMORROW": "Μέχρι αύριο"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 98b36ed80..1040d94df 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -49,7 +49,7 @@
         "HELP": "Για να προσθέσετε το Προφίλ Twitter ως κανάλι, πρέπει να επικυρώστε το Προφίλ σας στο Twiter κάνοντας click στο 'Είσοδος με το Twitter' ",
         "ERROR_MESSAGE": "Παρουσιάστηκε σφάλμα σύνδεσης στο Twitter, παρακαλώ προσπαθήστε ξανά",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Δημιουργία συνομιλιών από τα αναφερόμενα Tweets"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Ενεργοποίηση καλωσορίσματος",
-          "HELP_TEXT": "Στείλτε ένα καλωσόρισμα στον χρήστης όταν ξεκινάει την συζήτηση.",
+          "HELP_TEXT": "Στείλτε ένα χαιρετισμό μήνυμα στους χρήστες που ξεκινούν τη συνομιλία.",
           "ENABLED": "Ενεργό",
           "DISABLED": "Ανενεργό"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS κανάλι μέσω Twilio",
-        "DESC": "Ξεκινήστε να υποστηρίζετε τους πελάτες σας μέσω SMS με την ενσωμάτωση Twilio."
+        "TITLE": "Κανάλι SMS",
+        "DESC": "Ξεκινήστε να υποστηρίζετε τους πελάτες σας μέσω SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Εύρος Ζώνης"
+        },
+        "API": {
+          "ERROR_MESSAGE": "Δεν ήμασταν σε θέση να αποθηκεύσουμε το κανάλι SMS"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "ID Λογαριασμού",
+            "PLACEHOLDER": "Παρακαλώ εισάγετε το ID του Λογαριασμού σας Bandwidth",
+            "ERROR": "Το πεδίο είναι απαραίτητο"
+          },
+          "API_KEY": {
+            "LABEL": "Κλειδί API",
+            "PLACEHOLDER": "Παρακαλώ εισάγετε το Bandwith API κλειδί σας",
+            "ERROR": "Το πεδίο είναι απαραίτητο"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Παρακαλώ εισάγετε το Bandwith API Secret",
+            "ERROR": "Το πεδίο είναι απαραίτητο"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "ID Εφαρμογής",
+            "PLACEHOLDER": "Παρακαλώ εισάγετε το ID του Λογαριασμού σας Bandwidth",
+            "ERROR": "Το πεδίο είναι απαραίτητο"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Όνομα Κιβωτίου",
+            "PLACEHOLDER": "Παρακαλώ εισάγετε ένα όνομα εισερχόμενων",
+            "ERROR": "Το πεδίο είναι απαραίτητο"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Αριθμός τηλεφώνου",
+            "PLACEHOLDER": "Παρακαλώ εισάγετε έναν αριθμό τηλεφώνου από τον οποίο θα σταλεί το μήνυμα.",
+            "ERROR": "Παρακαλώ καταχωρήστε μια έγκυρη τιμή. Ο αριθμός του τηλεφώνου πρέπει να ξεκινά με το σύμβολο `+`."
+          },
+          "SUBMIT_BUTTON": "Δημιουργήστε Bandwidth",
+          "API": {
+            "ERROR_MESSAGE": "Δεν ήταν δυνατή η πιστοποίηση των διαπιστευτηρίων Bandwidth. Δοκιμάστε ξανά"
+          },
+          "API_CALLBACK": {
+            "TITLE": "URL επανάκλησης",
+            "SUBTITLE": "Πρέπει να ρυθμίσετε το callback URL στο Bandwidth με το URL που αναφέρεται εδώ."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "Κανάλι WhatsApp",
@@ -305,6 +353,14 @@
         "ENABLED": "Ενεργό",
         "DISABLED": "Ανενεργό"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Ενεργό",
+        "DISABLED": "Ανενεργό"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Ενεργό",
+        "DISABLED": "Ανενεργό"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Ενεργοποίηση"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Επιτρέπεται η αυτόματη αντιστοίχιση",
       "ENABLE_CSAT": "Ενεργοποίηση CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Ενεργοποίηση/Απενεργοποίηση της έρευνας CSAT (ικανοποίηση πελατών) μετά την επίλυση μιας συνομιλίας",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Ενεργοποίηση της συνέχειας συνομιλίας μέσω email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Οι συζητήσεις θα συνεχίσουν μέσω email αν η διεύθυνση ηλεκτρονικού ταχυδρομείου επαφής είναι διαθέσιμη.",
       "INBOX_UPDATE_TITLE": "Ρυθμίσεις Κιβωτίου",
       "INBOX_UPDATE_SUB_TEXT": "Ενημερώστε τις ρυθμίσεις του κιβωτίου σας",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ενεργοποιήστε ή απενεργοποιήστε την αυτόματη αντιστοίχιση των νέων συζητήσεων στους πράκτορες αυτού του κιβωτίου.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Αναγνωριστικό Εισερχόμενων",
       "INBOX_IDENTIFIER_SUB_TEXT": "Χρησιμοποιήστε το διακριτικό `inbox_identifier` που εμφανίζεται εδώ για τον έλεγχο ταυτότητας των πελατών API.",
       "FORWARD_EMAIL_TITLE": "Προώθηση στο email",
-      "FORWARD_EMAIL_SUB_TEXT": "Προώθηση των email σας στην ακόλουθη διεύθυνση email."
+      "FORWARD_EMAIL_SUB_TEXT": "Προώθηση των email σας στην ακόλουθη διεύθυνση email.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Επιτρέψτε τα μηνύματα μετά την επίλυση της συνομιλίας",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Επιτρέψτε στους τελικούς χρήστες να στέλνουν μηνύματα ακόμη και μετά την επίλυση της συζήτησης."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Εκ νέου εξουσιοδότηση",
@@ -406,21 +466,21 @@
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Ορισμός λεπτομερειών IMAP",
+      "UPDATE": "Ενημέρωση ρυθμίσεων IMAP",
+      "TOGGLE_AVAILABILITY": "Ενεργοποίηση ρυθμίσεων IMAP για αυτά τα εισερχόμενα",
+      "TOGGLE_HELP": "Η ενεργοποίηση του IMAP θα βοηθήσει το χρήστη να λάβει email",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "Οι ρυθμίσεις IMAP ενημερώθηκαν επιτυχώς",
+        "ERROR_MESSAGE": "Αδυναμία ενημέρωσης των ρυθμίσεων IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Διεύθυνση",
+        "PLACE_HOLDER": "Διεύθυνση (π.χ: imap.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Θύρα",
+        "PLACE_HOLDER": "Θύρα"
       },
       "EMAIL": {
         "LABEL": "Email",
@@ -430,25 +490,25 @@
         "LABEL": "Κωδικός",
         "PLACE_HOLDER": "Κωδικός"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Ενεργοποίηση SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Ορισμός λεπτομερειών SMTP",
+      "UPDATE": "Ενημέρωση ρυθμίσεων SMTP",
+      "TOGGLE_AVAILABILITY": "Ενεργοποίηση ρυθμίσεων SMTP για αυτά τα εισερχόμενα",
+      "TOGGLE_HELP": "Η ενεργοποίηση του SMTP θα βοηθήσει τον χρήστη να στείλει email",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "Οι ρυθμίσεις SMTP ενημερώθηκαν επιτυχώς",
+        "ERROR_MESSAGE": "Αδυναμία ενημέρωσης των ρυθμίσεων SMTP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Διεύθυνση",
+        "PLACE_HOLDER": "Διεύθυνση (π.χ: smtp.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Θύρα",
+        "PLACE_HOLDER": "Θύρα"
       },
       "EMAIL": {
         "LABEL": "Email",
diff --git a/app/javascript/dashboard/i18n/locale/el/index.js b/app/javascript/dashboard/i18n/locale/el/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/el/index.js
+++ b/app/javascript/dashboard/i18n/locale/el/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 482069d00..5fef1a0e1 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -4,8 +4,8 @@
     "TITLE": "Ρυθμίσεις Προφίλ",
     "BTN_TEXT": "Ενημέρωση Προφίλ",
     "DELETE_AVATAR": "Διαγραφή Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
+    "AVATAR_DELETE_SUCCESS": "Το Avatar διαγράφηκε με επιτυχία",
+    "AVATAR_DELETE_FAILED": "Παρουσιάστηκε σφάλμα κατά τη διαγραφή του avatar, παρακαλώ προσπαθήστε ξανά",
     "UPDATE_SUCCESS": "Το προφίλ σας ενημερώθηκε επιτυχώς",
     "PASSWORD_UPDATE_SUCCESS": "Ο κωδικός σας άλλαξε με επιτυχία",
     "AFTER_EMAIL_CHANGED": "Το προφίλ σας ενημερώθηκε επιτυχώς, παρακαλώ κάντε είσοδο (login) επειδή τα στοιχεία εισόδου σας έχουν αλλάξει",
@@ -89,7 +89,7 @@
         "PLACEHOLDER": "Παρακαλώ εισάγετε τον τρέχοντα κωδικό πρόσβασης"
       },
       "PASSWORD": {
-        "LABEL": "Κωδικός (Password)",
+        "LABEL": "Νέος κωδικός πρόσβασης",
         "ERROR": "Παρακαλώ εισάγετε κωδικό τουλάχιστον 6 χαρακτήρων",
         "PLACEHOLDER": "Παρακαλώ εισάγετε ένα νέο κωδικό (password)"
       },
@@ -103,7 +103,7 @@
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Να αλλάξει",
     "CHANGE_ACCOUNTS": "Αλλαγή Λογαριασμού",
-    "CONTACT_SUPPORT": "Contact Support",
+    "CONTACT_SUPPORT": "Υποστήριξη Επαφών",
     "SELECTOR_SUBTITLE": "Επιλέξτε ένα λογαριασμό από την Λίστα",
     "PROFILE_SETTINGS": "Ρυθμίσεις Προφίλ",
     "KEYBOARD_SHORTCUTS": "Συντομεύσεις Πληκτρολογίου",
@@ -112,7 +112,7 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "ημέρες δοκιμαστικής περιόδου απομένουν.",
     "TRAIL_BUTTON": "Αγόρασε τώρα",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Διαγραμμένος Χρήστης"
   },
   "COMPONENTS": {
     "CODE": {
@@ -136,7 +136,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Συζητήσεις",
     "ALL_CONVERSATIONS": "Όλες Οι Συνομιλίες",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "Αναφορές",
     "REPORTS": "Αναφορές",
     "SETTINGS": "Ρυθμίσεις",
     "CONTACTS": "Επαφές",
@@ -153,11 +153,13 @@
     "CUSTOM_ATTRIBUTES": "Προσαρμοζόμενες Ιδιότητες",
     "AUTOMATION": "Αυτοματισμός",
     "TEAMS": "Ομάδες",
+    "CUSTOM_VIEWS_FOLDER": "Φάκελοι",
+    "CUSTOM_VIEWS_SEGMENTS": "Τμήματα",
     "ALL_CONTACTS": "Όλες Οι Επαφές",
     "TAGGED_WITH": "Ετικέτα με",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
+    "NEW_LABEL": "Νέα ετικέτα",
+    "NEW_TEAM": "Νέα ομάδα",
+    "NEW_INBOX": "Νέο Κιβώτιο εισερχόμενων",
     "REPORTS_OVERVIEW": "Επισκόπηση",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Καμπάνιες",
@@ -167,7 +169,7 @@
     "REPORTS_LABEL": "Ετικέτες",
     "REPORTS_INBOX": "Εισερχόμενα",
     "REPORTS_TEAM": "Ομάδα",
-    "SET_AVAILABILITY_TITLE": "Set yourself as"
+    "SET_AVAILABILITY_TITLE": "Ορίστε τον εαυτό σας ως"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ωχ! Δεν μπορέσαμε να βρούμε κανένα λογαριασμό Chatwoot. Παρακαλούμε δημιουργήστε ένα νέο λογαριασμό για να συνεχίσετε.",
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index c769ab472..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -18,17 +21,17 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
-import { default as _advancedFilters } from './advancedFilters.json';
-import { default as _automation } from './automation.json';
-import { default as _contactFilters } from './contactFilters.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
@@ -43,7 +46,4 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
-  ..._advancedFilters,
-  ..._automation,
-  ..._contactFilters,
 };
diff --git a/app/javascript/dashboard/i18n/locale/es/advancedFilters.json b/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
index 0dd754e06..3128d2191 100644
--- a/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contiene",
       "does_not_contain": "No contiene",
       "is_present": "Está presente",
-      "is_not_present": "No está presente"
+      "is_not_present": "No está presente",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Estado",
@@ -31,7 +33,54 @@
       "LABELS": "Etiquetas",
       "BROWSER_LANGUAGE": "Idioma del navegador",
       "COUNTRY_NAME": "Nombre del país",
-      "REFERER_LINK": "Enlace de referencia"
+      "REFERER_LINK": "Enlace de referencia",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Atributos personalizados"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "El nombre es requerido",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Cancelar",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Carpeta creada con éxito",
+          "ERROR_MESSAGE": "Error al crear la carpeta"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segmento creado con éxito",
+          "ERROR_MESSAGE": "Error al crear segmento"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirmar eliminación",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Sí, eliminar",
+            "NO": "No, mantenerlo"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Carpeta eliminada con éxito",
+          "ERROR_MESSAGE": "Error al eliminar carpeta"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segmento eliminado con éxito",
+          "ERROR_MESSAGE": "Error al eliminar segmento"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/automation.json b/app/javascript/dashboard/i18n/locale/es/automation.json
index 450b614e7..9e0f6171b 100644
--- a/app/javascript/dashboard/i18n/locale/es/automation.json
+++ b/app/javascript/dashboard/i18n/locale/es/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automatización",
-    "HEADER_BTN_TXT": "Añadir regla de automatización"
+    "HEADER_BTN_TXT": "Añadir regla de automatización",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Añadir regla de automatización",
+      "SUBMIT": "Crear",
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "El nombre es requerido"
+        },
+        "DESC": {
+          "LABEL": "Descripción",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Descripción requerida"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Por favor, seleccione uno",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Acciones"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nombre",
+        "Descripción",
+        "Activo",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Eliminar",
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "CONFIRM": {
+        "TITLE": "Confirmar eliminación",
+        "MESSAGE": "¿Está seguro de eliminar ",
+        "YES": "Sí, eliminar ",
+        "NO": "No, mantenerlo "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Editar",
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Editar",
+      "CREATE": "Crear",
+      "DELETE": "Eliminar",
+      "CANCEL": "Cancelar",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/campaign.json b/app/javascript/dashboard/i18n/locale/es/campaign.json
index a6dbb08be..80334cd15 100644
--- a/app/javascript/dashboard/i18n/locale/es/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/es/campaign.json
@@ -114,7 +114,7 @@
     },
     "ONE_OFF": {
       "HEADER": "Campañas únicas",
-      "404": "There are no one off campaigns created",
+      "404": "No hay campañas en curso creadas",
       "INBOXES_NOT_FOUND": "Por favor, crea una bandeja de entrada sms y empieza a añadir campañas"
     },
     "ONGOING": {
diff --git a/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json
index ecfdfb326..c1acac701 100644
--- a/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Añadir respuesta predefinida",
     "LOADING": "Obteniendo respuestas predefinidas",
     "SEARCH_404": "No hay elementos que coincidan con esta consulta",
-    "SIDEBAR_TXT": "<p><b>Respuestas predefinidas</b> </p><p> Respuestas predefinidas son plantillas de respuesta guardadas que pueden utilizarse para enviar rápidamente una respuesta a una conversación. </p><p> Para crear una respuesta predefinida, simplemente haga clic en <b>Añadir respuesta predefinida</b>. También puede editar o eliminar una respuesta predefinida haciendo clic en el botón Editar o Borrar </p><p> Las respuestas predefinidas se utilizan con la ayuda de <b>Códigos cortos</b>. Los agentes pueden acceder a las respuestas predefinidas mientras están en un chat escribiendo <b>'/'</b> seguido del código corto. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "No hay respuestas enlatadas disponibles en esta cuenta.",
       "TITLE": "Administrar respuestas predefinidas",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Añadir respuesta predefinida",
-      "DESC": "Las respuestas predefinidas son plantillas de respuesta guardadas que se pueden utilizar para enviar rápidamente la respuesta a la conversación .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Código corto",
-          "PLACEHOLDER": "Por favor, introduzca un código corto",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "El código corto es requerido"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 42ddf8e43..1dea0e6ee 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -24,12 +24,12 @@
     ],
     "ASSIGNEE_TYPE_TABS": [
       {
-        "NAME": "Mina",
+        "NAME": "Mías",
         "KEY": "me",
         "COUNT_KEY": "mineCount"
       },
       {
-        "NAME": "Sin asignar",
+        "NAME": "Unassigned",
         "KEY": "unassigned",
         "COUNT_KEY": "unAssignedCount"
       },
@@ -44,13 +44,13 @@
         "TEXT": "Abrir"
       },
       "resolved": {
-        "TEXT": "Resuelto"
+        "TEXT": "Resueltas"
       },
       "pending": {
-        "TEXT": "Pendiente"
+        "TEXT": "Pendientes"
       },
       "snoozed": {
-        "TEXT": "Retrasado"
+        "TEXT": "Postpuestas"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 95f328bd3..7db2bba77 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "Empresa",
     "LOCATION": "Ubicación",
     "CONVERSATION_TITLE": "Detalles de la conversación",
-    "VIEW_PROFILE": "Ver perfil",
+    "VIEW_PROFILE": "Ver Perfil",
     "BROWSER": "Navegador",
     "OS": "Sistema operativo",
     "INITIATED_FROM": "Iniciado desde",
@@ -169,6 +169,7 @@
       "SUBMIT": "Enviar mensaje",
       "CANCEL": "Cancelar",
       "SUCCESS_MESSAGE": "¡Mensaje enviado!",
+      "GO_TO_CONVERSATION": "Ver",
       "ERROR_MESSAGE": "¡No se pudo enviar! intente nuevamente"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Buscar",
     "SEARCH_INPUT_PLACEHOLDER": "Buscar contactos",
     "FILTER_CONTACTS": "Filtro",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Eliminar filtro",
     "LIST": {
       "LOADING_MESSAGE": "Cargando contactos...",
       "404": "No hay contactos que coincidan con tu búsqueda 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/es/contactFilters.json b/app/javascript/dashboard/i18n/locale/es/contactFilters.json
index f4d082c61..58d076f1e 100644
--- a/app/javascript/dashboard/i18n/locale/es/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/es/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contiene",
             "does_not_contain": "No contiene",
             "is_present": "Está presente",
-            "is_not_present": "No está presente"
+            "is_not_present": "No está presente",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nombre",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Número de teléfono",
             "IDENTIFIER": "Idenrificador",
             "CITY": "Ciudad",
-            "COUNTRY": "País"
+            "COUNTRY": "País",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Atributos personalizados"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 05e3c3196..aeeb3c837 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Cargando conversaciones",
     "CANNOT_REPLY": "No puede responder debido a",
     "24_HOURS_WINDOW": "Restricción de la ventana de mensajes de 24 horas",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Asignar a mi",
     "TWILIO_WHATSAPP_CAN_REPLY": "Sólo puede responder a esta conversación usando una plantilla de mensaje debido a",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restricción de la ventana de mensajes de 24 horas",
     "SELECT_A_TWEET_TO_REPLY": "Por favor, seleccione un tweet al que responder.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "El archivo excede el límite de los archivos adjuntos {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "No se puede enviar este mensaje, por favor inténtalo de nuevo más tarde",
     "SENT_BY": "Enviado por:",
+    "BOT": "Bot",
+    "SEND_FAILED": "¡No se pudo enviar el mensaje! Inténtalo de nuevo",
+    "TRY_AGAIN": "reintentar",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Seleccionar agente",
       "REMOVE": "Eliminar",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite a los miembros de su equipo",
-      "DESCRIPTION": "Ya que usted se está preparando para hablar con su cliente, traiga a sus compañeros para asistirle. Puedes invitar a sus compañeros de equipo añadiendo su dirección de correo electrónico a la lista de agentes.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Haga clic aquí para invitar a un miembro del equipo"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 625e11d0d..1b100be80 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Número de días después de que un ticket se resuelva automáticamente si no hay actividad",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor, introduzca una duración válida de resolución automática (mínimo 1 día)"
+        "ERROR": "Por favor introduzca una duración válida de resolución automática (mínimo 1 día y máximo 999 días)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuidad de la conversación con emails está habilitada para su cuenta.",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 7d79174fe..3f04a47be 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -30,7 +30,7 @@
     "ADD": {
       "CHANNEL_NAME": {
         "LABEL": "Nombre de la bandeja de entrada",
-        "PLACEHOLDER": "Introduzca su nombre de bandeja de entrada (por ejemplo: Acme Inc)"
+        "PLACEHOLDER": "Introduzca el nombre de la bandeja de entrada (por ejemplo: Acme Inc)"
       },
       "WEBSITE_NAME": {
         "LABEL": "Nombre del sitio web",
@@ -61,7 +61,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL de Webhook",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Ingrese su URL de Webhook",
           "ERROR": "Por favor, introduzca una URL válida"
         },
         "CHANNEL_DOMAIN": {
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Habilitar bienvenida al canal",
-          "HELP_TEXT": "Enviar un mensaje de bienvenida al usuario cuando inicie la conversación.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Activado",
           "DISABLED": "Deshabilitado"
         },
@@ -100,8 +100,8 @@
         "SUBMIT_BUTTON": "Crear bandeja de entrada"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Canal Twilio SMS/WhatsApp",
+        "DESC": "Integre Twilio y comience a apoyar a sus clientes mediante SMS o WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "Cuenta SID",
           "PLACEHOLDER": "Introduce tu SID de cuenta de Twilio",
@@ -118,7 +118,7 @@
         },
         "CHANNEL_NAME": {
           "LABEL": "Nombre de la bandeja de entrada",
-          "PLACEHOLDER": "Please enter a inbox name",
+          "PLACEHOLDER": "Por favor, introduzca un nombre de bandeja de entrada",
           "ERROR": "Este campo es obligatorio"
         },
         "PHONE_NUMBER": {
@@ -136,20 +136,68 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "Proveedor de API",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "ID de Cuenta",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Este campo es obligatorio"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Este campo es obligatorio"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Este campo es obligatorio"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Este campo es obligatorio"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nombre de la bandeja de entrada",
+            "PLACEHOLDER": "Por favor, introduzca un nombre de bandeja de entrada",
+            "ERROR": "Este campo es obligatorio"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Número de teléfono",
+            "PLACEHOLDER": "Por favor, introduzca el número de teléfono desde el que se enviará el mensaje.",
+            "ERROR": "Por favor, introduzca un valor válido. El número de teléfono debe comenzar con la firma `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "URL de devolución de llamada",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
-        "DESC": "Start supporting your customers via WhatsApp.",
+        "TITLE": "Canal de WhatsApp",
+        "DESC": "Comience a apoyar a sus clientes mediante WhatsApp.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Proveedor de API",
           "TWILIO": "Twilio",
-          "360_DIALOG": "360Dialog"
+          "360_DIALOG": "360 Diálogo"
         },
         "INBOX_NAME": {
           "LABEL": "Nombre de la bandeja de entrada",
-          "PLACEHOLDER": "Please enter an inbox name",
+          "PLACEHOLDER": "Por favor, introduzca un nombre de bandeja de entrada",
           "ERROR": "Este campo es obligatorio"
         },
         "PHONE_NUMBER": {
@@ -158,15 +206,15 @@
           "ERROR": "Por favor, introduzca un valor válido. El número de teléfono debe comenzar con la firma `+`."
         },
         "API_KEY": {
-          "LABEL": "API key",
-          "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
-          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "Clave de API",
+          "SUBTITLE": "Configurar la clave API de WhatsApp.",
+          "PLACEHOLDER": "Clave de API",
+          "APPLY_FOR_ACCESS": "¿No tiene ninguna clave API? Solicite acceso aquí",
+          "ERROR": "Por favor, introduzca un valor válido."
         },
-        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "SUBMIT_BUTTON": "Crear canal de WhatsApp",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+          "ERROR_MESSAGE": "No pudimos guardar el canal de WhatsApp"
         }
       },
       "API_CHANNEL": {
@@ -207,50 +255,50 @@
         "FINISH_MESSAGE": "Empieze a reenviar su emails a la siguiente dirección de email."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
-        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "TITLE": "Canal LÍNEA",
+        "DESC": "Integre con el canal LINE y comience a apoyar a sus clientes.",
         "CHANNEL_NAME": {
           "LABEL": "Nombre del canal",
           "PLACEHOLDER": "Por favor, introduzca un nombre de canal",
           "ERROR": "Este campo es obligatorio"
         },
         "LINE_CHANNEL_ID": {
-          "LABEL": "LINE Channel ID",
-          "PLACEHOLDER": "LINE Channel ID"
+          "LABEL": "ID del canal LINE",
+          "PLACEHOLDER": "ID del canal LINE"
         },
         "LINE_CHANNEL_SECRET": {
-          "LABEL": "LINE Channel Secret",
-          "PLACEHOLDER": "LINE Channel Secret"
+          "LABEL": "Secreto del canal LINE",
+          "PLACEHOLDER": "Secreto del canal LINE"
         },
         "LINE_CHANNEL_TOKEN": {
-          "LABEL": "LINE Channel Token",
-          "PLACEHOLDER": "LINE Channel Token"
+          "LABEL": "Token de canal LINE",
+          "PLACEHOLDER": "Token de canal LINE"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "Crear canal LINE",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+          "ERROR_MESSAGE": "No pudimos guardar el canal LINE"
         },
         "API_CALLBACK": {
           "TITLE": "URL de devolución de llamada",
-          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+          "SUBTITLE": "Tiene que configurar la URL del webhook en la aplicación LINE con la URL mencionada aquí."
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
-        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "TITLE": "Canal de Telegram",
+        "DESC": "Integre con el canal de Telegram y comience a apoyar a sus clientes.",
         "BOT_TOKEN": {
           "LABEL": "Bot Token",
-          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
+          "SUBTITLE": "Configura el token de bot que has obtenido de Telegram BotFather.",
           "PLACEHOLDER": "Bot Token"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "Crear canal de Telegram",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "No pudimos guardar el canal de telegram"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+        "TITLE": "Elija un canal",
+        "DESC": "Chatwoot soporta widget, página de Facebook, perfil de Twitter, WhatsApp, correo electrónico, etc. como canales. Si quieres crear un canal personalizado, puedes crearlo utilizando el canal API. Selecciona un canal de las opciones de abajo para continuar."
       },
       "AGENTS": {
         "TITLE": "Agentes",
@@ -305,13 +353,21 @@
         "ENABLED": "Activado",
         "DISABLED": "Deshabilitado"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Activado",
+        "DISABLED": "Deshabilitado"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Activado",
+        "DISABLED": "Deshabilitado"
+      },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "Habilitar"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Eliminar",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Eliminar avatar",
       "CONFIRM": {
         "TITLE": "Confirmar eliminación",
         "MESSAGE": "¿Está seguro de eliminar ",
@@ -322,8 +378,8 @@
       "API": {
         "SUCCESS_MESSAGE": "Bandeja de entrada eliminada correctamente",
         "ERROR_MESSAGE": "No se pudo eliminar la bandeja de entrada. Inténtalo de nuevo más tarde.",
-        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
-        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+        "AVATAR_SUCCESS_MESSAGE": "Avatar de bandeja de entrada eliminado correctamente",
+        "AVATAR_ERROR_MESSAGE": "No se pudo eliminar el avatar de la bandeja de entrada. Inténtalo de nuevo más tarde."
       }
     },
     "TABS": {
@@ -350,18 +406,22 @@
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Activar o desactivar la caja de recolección de correo electrónico",
       "AUTO_ASSIGNMENT": "Activar asignación automática",
       "ENABLE_CSAT": "Habilitar Encuesta de Satisfacción",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CSAT_SUB_TEXT": "Habilitar/deshabilitar encuesta CSAT(satisfacción del cliente) después de resolver una conversación",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Habilitar continuidad de conversación por correo electrónico",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Las conversaciones continuarán por correo electrónico si la dirección de correo electrónico de contacto está disponible.",
       "INBOX_UPDATE_TITLE": "Ajustes de la Bandeja de Entrada",
       "INBOX_UPDATE_SUB_TEXT": "Actualizar la configuración de tu bandeja de entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activar o desactivar la asignación automática de nuevas conversaciones a los agentes añadidos a esta bandeja de entrada.",
       "HMAC_VERIFICATION": "Validación de identidad de usuario",
-      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
+      "HMAC_DESCRIPTION": "Con el fin de validar la identidad de los usuarios, el SDK le permite pasar un `identity_hash` por cada usuario. Puede generar HMAC usando 'sha256' con la clave que se muestra aquí.",
+      "HMAC_MANDATORY_VERIFICATION": "Forzar validación de identidad de usuario",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
+      "INBOX_IDENTIFIER": "Identificador de bandeja de entrada",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Empieze a reenviar su emails a la siguiente dirección de email."
+      "FORWARD_EMAIL_TITLE": "Reenviar al correo",
+      "FORWARD_EMAIL_SUB_TEXT": "Empieze a reenviar su emails a la siguiente dirección de email.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautorizar",
@@ -393,7 +453,7 @@
       "TIMEZONE_LABEL": "Seleccione la zona horaria",
       "UPDATE": "Actualice las horas de atención",
       "TOGGLE_AVAILABILITY": "Habilite la disponibilidad de atención para esta bandeja de entrada",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
+      "UNAVAILABLE_MESSAGE_LABEL": "Mensaje no disponible para visitantes",
       "UNAVAILABLE_MESSAGE_DEFAULT": "No estamos disponibles en este momento. Déjenos un mensaje y le responderemos tan pronto estemos de regreso.",
       "TOGGLE_HELP": "Al habilitar el horario de atención se mostraran las horas disponibles en el \"widget\" del chat en vivo si todos los agentes están fuera de línea. Fuera de las horas disponibles los visitantes pueden ser notificado con un mensaje y una forma PreChat.",
       "DAY": {
@@ -406,21 +466,21 @@
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Configura los detalles de IMAP",
+      "UPDATE": "Actualizar ajustes IMAP",
+      "TOGGLE_AVAILABILITY": "Habilitar configuración IMAP para esta bandeja de entrada",
+      "TOGGLE_HELP": "Habilitar IMAP ayudará al usuario a recibir correo electrónico",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "Configuración IMAP actualizada correctamente",
+        "ERROR_MESSAGE": "No se puede actualizar la configuración IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Dirección",
+        "PLACE_HOLDER": "Dirección (Ej: imap.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Puerto",
+        "PLACE_HOLDER": "Puerto"
       },
       "EMAIL": {
         "LABEL": "E-mail",
@@ -430,25 +490,25 @@
         "LABEL": "Contraseña",
         "PLACE_HOLDER": "Contraseña"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Activar SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Configura tus detalles de SMTP",
+      "UPDATE": "Actualizar ajustes SMTP",
+      "TOGGLE_AVAILABILITY": "Habilitar configuración SMTP para esta bandeja de entrada",
+      "TOGGLE_HELP": "Habilitar SMTP ayudará al usuario a enviar correo electrónico",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "Configuración SMTP actualizada correctamente",
+        "ERROR_MESSAGE": "No se puede actualizar la configuración SMTP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Dirección",
+        "PLACE_HOLDER": "Dirección (Ej: smtp.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Puerto",
+        "PLACE_HOLDER": "Puerto"
       },
       "EMAIL": {
         "LABEL": "E-mail",
diff --git a/app/javascript/dashboard/i18n/locale/es/index.js b/app/javascript/dashboard/i18n/locale/es/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/es/index.js
+++ b/app/javascript/dashboard/i18n/locale/es/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 15fcc17a3..a868558d3 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Por favor, introduzca su contraseña actual"
       },
       "PASSWORD": {
-        "LABEL": "Contraseña",
+        "LABEL": "Nueva contraseña",
         "ERROR": "Por favor, introduzca una contraseña de longitud 6 o más",
         "PLACEHOLDER": "Por favor, introduzca una nueva contraseña"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirmar nueva contraseña",
         "ERROR": "Confirmar contraseña debe coincidir con la contraseña",
-        "PLACEHOLDER": "Por favor, vuelva a introducir su contraseña"
+        "PLACEHOLDER": "Por favor, vuelva a introducir su nueva contraseña"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Atributos personalizados",
     "AUTOMATION": "Automatización",
     "TEAMS": "Equipos",
+    "CUSTOM_VIEWS_FOLDER": "Carpetas",
+    "CUSTOM_VIEWS_SEGMENTS": "Segmentos",
     "ALL_CONTACTS": "Todos los contactos",
     "TAGGED_WITH": "Etiquetado con",
     "NEW_LABEL": "Nueva etiqueta",
diff --git a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
index e59f3ed2f..2125e478b 100644
--- a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Crear un nuevo equipo",
     "HEADER": "Equipos",
-    "SIDEBAR_TXT": "<p><b>Equipos</b></p> <p>Los equipos le permiten organizar sus agentes en grupos con base en sus responsabilidades,<br />Un usuario puede ser parte de varios equipos. Usted puede asignar conversaciones a un equipo cuando ellos están trabajando colaborativamente.</p>",
+    "SIDEBAR_TXT": "<p><b>Equipos</b></p> <p>Los equipos le permiten organizar sus agentes en grupos basados en sus responsabilidades. <br /> Un agente puede ser parte de múltiples equipos. Puedes asignar conversaciones a un equipo cuando trabajas en colaboración. </p>",
     "LIST": {
       "404": "No hay equipos creados en ésta cuenta.",
       "EDIT_TEAM": "Editar equipo"
diff --git a/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json b/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
index accae8b15..919009890 100644
--- a/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "شامل",
       "does_not_contain": "شامل نمی‌شود",
       "is_present": "در حال حاضر وجود دارد",
-      "is_not_present": "در حال حاضر وجود ندارد"
+      "is_not_present": "در حال حاضر وجود ندارد",
+      "is_greater_than": "بزرگتر از",
+      "is_lesser_than": "کوچکتر از"
     },
     "ATTRIBUTES": {
       "STATUS": "وضعیت",
@@ -31,7 +33,54 @@
       "LABELS": "برچسب‌ها",
       "BROWSER_LANGUAGE": "مرور زبان",
       "COUNTRY_NAME": "نام کشور",
-      "REFERER_LINK": "پیوند ارجاع‌دهنده"
+      "REFERER_LINK": "پیوند ارجاع‌دهنده",
+      "CUSTOM_ATTRIBUTE_LIST": "فهرست",
+      "CUSTOM_ATTRIBUTE_TEXT": "متن",
+      "CUSTOM_ATTRIBUTE_NUMBER": "شماره",
+      "CUSTOM_ATTRIBUTE_LINK": "پیوند",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "چک باکس"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "فیلترهای استاندارد",
+      "ADDITIONAL_FILTERS": "فیلترهای اضافی",
+      "CUSTOM_ATTRIBUTES": "ویژگی‌های سفارشی"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "آیا می‌خواهید این فیلتر را ذخیره کنید؟",
+        "LABEL": "نام این فیلتر",
+        "PLACEHOLDER": "یک نام برای این فیلتر وارد کنید",
+        "ERROR_MESSAGE": "نام الزامی است",
+        "SAVE_BUTTON": "ذخیره فیلتر",
+        "CANCEL_BUTTON": "انصراف",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "پوشه با موفقیت ایجاد شد",
+          "ERROR_MESSAGE": "در هنگام ایجاد پوشه خطایی رخ داد"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "بخش با موفقیت ایجاد شد",
+          "ERROR_MESSAGE": "خطا هنگام ایجاد بخش"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "حذف فیلتر",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "تاییدیه حذف",
+            "MESSAGE": "آیا مطمئن هستید که فیلتر را حذف می‌کنید ",
+            "YES": "بله، حذف شود",
+            "NO": "خیر، بماند"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "پوشه با موفقیت حذف شد",
+          "ERROR_MESSAGE": "در هنگام حذف پوشه خطایی رخ داد"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "بخش با موفقیت حذف شد",
+          "ERROR_MESSAGE": "خطا هنگام حذف بخش"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/automation.json b/app/javascript/dashboard/i18n/locale/fa/automation.json
index 0136fb547..8cd6e04d5 100644
--- a/app/javascript/dashboard/i18n/locale/fa/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "خودکارسازی",
-    "HEADER_BTN_TXT": "افزودن قانون خودکارسازی"
+    "HEADER_BTN_TXT": "افزودن قانون خودکارسازی",
+    "LOADING": "واکشی قوانین اتوماسیون",
+    "SIDEBAR_TXT": "<p><b>قوانین خودکارسازی</b> <p>اتوماسیون می‌تواند جایگزین و خودکار فرآیندهای موجودی باشد که نیاز به تلاش دستی دارند. شما می توانید بسیاری از کارها را با اتوماسیون انجام دهید، از جمله افزودن برچسب ها و اختصاص مکالمه به بهترین نماینده. بنابراین تیم روی کارهایی که به بهترین شکل انجام می‌دهند تمرکز می‌کنند و زمان کمی را برای کارهای دستی صرف می‌کنند.</p>",
+    "ADD": {
+      "TITLE": "افزودن قانون خودکارسازی",
+      "SUBMIT": "ايجاد كردن",
+      "CANCEL_BUTTON_TEXT": "انصراف",
+      "FORM": {
+        "NAME": {
+          "LABEL": "نام قانون",
+          "PLACEHOLDER": "نام قانون را وارد کنید",
+          "ERROR": "نام الزامی است"
+        },
+        "DESC": {
+          "LABEL": "توضیحات",
+          "PLACEHOLDER": "توضیحات قانون را وارد کنید",
+          "ERROR": "توضیحات الزامی است"
+        },
+        "EVENT": {
+          "LABEL": "رویداد",
+          "PLACEHOLDER": "لطفا یکی را انتخاب کنید",
+          "ERROR": "رویداد مورد نیاز است"
+        },
+        "CONDITIONS": {
+          "LABEL": "شرایط"
+        },
+        "ACTIONS": {
+          "LABEL": "عملیات"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "اضافه کردن شرط",
+      "ACTION_BUTTON_LABEL": "افزودن اکشن",
+      "API": {
+        "SUCCESS_MESSAGE": "قانون اتوماسیون با موفقیت اضافه شد",
+        "ERROR_MESSAGE": "نمی‌توان یک قانون اتوماسیون ایجاد کرد، لطفاً بعداً دوباره امتحان کنید"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "نام",
+        "توضیحات",
+        "فعال",
+        "ایجاد شده در"
+      ],
+      "404": "هیچ قانون اتوماسیون یافت نشد"
+    },
+    "DELETE": {
+      "TITLE": "قانون اتوماسیون را حذف کنید",
+      "SUBMIT": "حذف",
+      "CANCEL_BUTTON_TEXT": "انصراف",
+      "CONFIRM": {
+        "TITLE": "تاییدیه حذف",
+        "MESSAGE": "مطمئن هستید که حذف شود ",
+        "YES": "بله، حذف شود ",
+        "NO": "نه، بماند "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "قانون اتوماسیون با موفقیت حذف شد",
+        "ERROR_MESSAGE": "نمی‌توان یک قانون اتوماسیون را حذف کرد، لطفاً بعداً دوباره امتحان کنید"
+      }
+    },
+    "EDIT": {
+      "TITLE": "ویرایش قانون اتوماسیون",
+      "SUBMIT": "ویرایش",
+      "CANCEL_BUTTON_TEXT": "انصراف",
+      "API": {
+        "SUCCESS_MESSAGE": "قانون اتوماسیون با موفقیت به روز شد",
+        "ERROR_MESSAGE": "قانون اتوماسیون به‌روزرسانی نشد، لطفاً بعداً دوباره امتحان کنید"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "ویرایش",
+      "CREATE": "ايجاد كردن",
+      "DELETE": "حذف",
+      "CANCEL": "انصراف",
+      "RESET_MESSAGE": "با تغییر نوع رویداد، شرایط و رویدادهایی که در زیر اضافه کرده‌اید بازنشانی می‌شود"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json
index c6b943f40..a0131b20d 100644
--- a/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "اضافه کردن پاسخ آماده",
     "LOADING": "دریافت پاسخ‌های آماده",
     "SEARCH_404": "هیچ آیتمی با این مشخصات یافت نشد",
-    "SIDEBAR_TXT": "<p><b>پاسخ‌های آماده</b> </p>\n<p> پاسخ‌های آماده قالب‌هایی متنی هستند که برای جواب دادن سریع به یک گفتگو به کار می‌آیند. </p><p> برای ساختن یک جواب آماده، روی دکمه <b>اضافه کردن جواب آماده</b> کلیک کنید. همچنین با زدن روی دکمه «تغییر» یا «حذف» می‌توانید یک پاسخ آماده را تغییر داده یا حذف کنید. </p><p> پاسخ‌های آماده با استفاده و با کمک <b>کدهای کوتاه</b> ساخته شده‌اند. ایجنت ها با زدن کلید  <b>'/'</b> از صفحه کلید می‌توانند به لیست پاسخ‌های آماده دسترسی پیدا کنند. </p>",
+    "SIDEBAR_TXT": "<p><b>پاسخ‌های آماده</b> </p><p> پاسخ‌های آماده، الگوهای پاسخ ذخیره‌شده‌ای هستند که می‌توانند برای ارسال سریع پاسخ به یک مکالمه استفاده شوند. </p><p> برای ایجاد یک پاسخ آماده، فقط روی <b>افزودن پاسخ آماده</b> کلیک کنید. همچنین می توانید با کلیک بر روی دکمه ویرایش یا حذف، یک پاسخ آماده موجود را ویرایش یا حذف کنید </p><p> پاسخ های آماده با کمک <b>کدهای کوتاه</b> استفاده می شود. نمایندگان می توانند در حین چت با تایپ <b>'/'</b> و سپس کد کوتاه به پاسخ های آماده دسترسی پیدا کنند. </p>",
     "LIST": {
       "404": "هیچ پاسخ آماده‌ای برای این حساب تعریف نشده است",
       "TITLE": "مدیریت پاسخ‌های آماده",
@@ -17,7 +17,7 @@
     },
     "ADD": {
       "TITLE": "اضافه کردن پاسخ آماده",
-      "DESC": "پاسخ‌های آماده قالب‌های متنی پیش آماده‌ای هستند که برای پاسخگویی سریع به یک گفتگو می‌توانند مفید واقع شوند",
+      "DESC": "پاسخ های آماده الگوهای پاسخ ذخیره شده ای هستند که می توانند برای ارسال سریع پاسخ به مکالمه استفاده شوند.",
       "CANCEL_BUTTON_TEXT": "انصراف",
       "FORM": {
         "SHORT_CODE": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 0b54d7c2f..8eb06caf4 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "ارسال پیام",
       "CANCEL": "انصراف",
       "SUCCESS_MESSAGE": "پیام ارسال شد!",
+      "GO_TO_CONVERSATION": "نمایش",
       "ERROR_MESSAGE": "ارسال نشد! دوباره امتحان کنید"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "جستجو",
     "SEARCH_INPUT_PLACEHOLDER": "جستجوی مخاطبین",
     "FILTER_CONTACTS": "فیلتر",
+    "FILTER_CONTACTS_SAVE": "ذخیره فیلتر",
+    "FILTER_CONTACTS_DELETE": "حذف فیلتر",
     "LIST": {
       "LOADING_MESSAGE": "در حال بارگذاری مخاطبین...",
       "404": "هیچ مخاطبی با جستجوی شما مطابقت ندارد 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/fa/contactFilters.json b/app/javascript/dashboard/i18n/locale/fa/contactFilters.json
index 7aa657ec4..cb7da7684 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contactFilters.json
@@ -1,7 +1,7 @@
 {
     "CONTACTS_FILTER": {
         "TITLE": "فیلتر مخاطبین",
-        "SUBTITLE": "فیلترهای زیر را اضافه کنید و برای اعمال فیلتر کردن مخاطبین، برروی «ارسال» ضربه بزنید.",
+        "SUBTITLE": "فیلترهای زیر را اضافه کنید و برای اعمال فیلتر کردن مخاطبین، برروی «ثبت» ضربه بزنید.",
         "ADD_NEW_FILTER": "افزودن فیلتر",
         "CLEAR_ALL_FILTERS": "پاک کردن همه فیلترها",
         "FILTER_DELETE_ERROR": "شما باید حداقل یک فیلتر برای ذخیره داشته باشید",
@@ -20,7 +20,9 @@
             "contains": "شامل",
             "does_not_contain": "شامل نمی‌شود",
             "is_present": "در حال حاضر وجود دارد",
-            "is_not_present": "در حال حاضر وجود ندارد"
+            "is_not_present": "در حال حاضر وجود ندارد",
+            "is_greater_than": "بزرگتر از",
+            "is_lesser_than": "کوچکتر از"
         },
         "ATTRIBUTES": {
             "NAME": "نام",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "شماره تلفن",
             "IDENTIFIER": "شناسه",
             "CITY": "شهر",
-            "COUNTRY": "کشور"
+            "COUNTRY": "کشور",
+            "CUSTOM_ATTRIBUTE_LIST": "فهرست",
+            "CUSTOM_ATTRIBUTE_TEXT": "متن",
+            "CUSTOM_ATTRIBUTE_NUMBER": "شماره",
+            "CUSTOM_ATTRIBUTE_LINK": "پیوند",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "چک باکس"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "فیلترهای استاندارد",
+            "ADDITIONAL_FILTERS": "فیلترهای اضافی",
+            "CUSTOM_ATTRIBUTES": "ویژگی‌های سفارشی"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 3c3b59742..d29ba0388 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "در حال بارگیری گفتگو‌ها",
     "CANNOT_REPLY": "شما نمی‌توانید پاسخ بدهید به دلیل",
     "24_HOURS_WINDOW": "محدودیت ۲۴ ساعته پنجره پیام",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "اختصاص به من",
     "TWILIO_WHATSAPP_CAN_REPLY": "شما فقط می توانید با استفاده از یک پیام الگو به این مکالمه پاسخ دهید",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "محدودیت ۲۴ ساعته پنجره پیام",
     "SELECT_A_TWEET_TO_REPLY": "لطفا برای پاسخ دادن، یک توییت را انتخاب کنید.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "فایل ضمیمه شده بیشتر از {MAXIMUM_FILE_UPLOAD_SIZE} است",
     "MESSAGE_ERROR": "ارسال این پیام امکان پذیر نیست ، لطفاً بعداً دوباره امتحان کنید",
     "SENT_BY": "ارسال شده توسط:",
+    "BOT": "ربات",
+    "SEND_FAILED": "پیام ارسال نشد! دوباره امتحان کنید",
+    "TRY_AGAIN": "دوباره امتحان کنید",
     "ASSIGNMENT": {
       "SELECT_AGENT": "انتخاب ایجنت",
       "REMOVE": "حذف",
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index a0beb1a81..aede513a2 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "تعداد روزهایی که اگر فعالیتی وجود نداشته باشد، گفتگو به صورت خودکار بسته شود",
         "PLACEHOLDER": "۳۰",
-        "ERROR": "لطفاً یک مدت زمان حل خودکار معتبر (حداقل 1 روز) وارد کنید"
+        "ERROR": "لطفا یک مدت زمان حل خودکار معبر (بین حداقل 1 روز تا حداکثر 999 روز) وارد کنید"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "تداوم مکالمه با ایمیل برای حساب شما فعال است.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 6818b38fc..5f4d9fd5d 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "فعال کردن پیام پاسخگویی",
-          "HELP_TEXT": "به محض اینکه کاربر گفتگویی را شروع کرد، پیام مشخصی در جواب او ارسال می‌شود",
+          "HELP_TEXT": "هنگامی که کاربران گفتگو را شروع می‌کند، یک پیام تبریک ارسال کنید.",
           "ENABLED": "فعال شد",
           "DISABLED": "غیرفعال شد"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "کانال پیامک از طریق Twilio",
-        "DESC": "با ادغام Twilio از طریق SMS از مشتریان خود پشتیبانی کنید."
+        "TITLE": "کانال پیامک",
+        "DESC": "شروع به پشتیبانی از مشتریان از طریق پیامک.",
+        "PROVIDERS": {
+          "LABEL": "ارائه دهنده API",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "پهنای‌باند"
+        },
+        "API": {
+          "ERROR_MESSAGE": "ما نتوانستیم کانال پیامک را ذخیره کنیم"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "شناسه حساب‌کاربری",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "پر کردن این فیلد ضروری است"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "پر کردن این فیلد ضروری است"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "پر کردن این فیلد ضروری است"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "پر کردن این فیلد ضروری است"
+          },
+          "INBOX_NAME": {
+            "LABEL": "عنوان صندوق ورودی",
+            "PLACEHOLDER": "لطفاً نام صندوق ورودی را وارد کنید",
+            "ERROR": "پر کردن این فیلد ضروری است"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "شماره تلفن",
+            "PLACEHOLDER": "لطفا شماره‌ای که پیام‌ می‌بایست به آن ارسال شود را وارد کنید",
+            "ERROR": "لطفا شماره تلفن را به شکل صحیح وارد کنید. شماره می‌بایست با کاراکتر `+` شروع شود"
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "آدرس URL مربوط به API",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "کانال واتس اپ",
@@ -305,6 +353,14 @@
         "ENABLED": "فعال",
         "DISABLED": "غیرفعال"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "فعال",
+        "DISABLED": "غیرفعال"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "فعال",
+        "DISABLED": "غیرفعال"
+      },
       "ENABLE_HMAC": {
         "LABEL": "فعال"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "فعال کردن واگذاری خودکار گفتگو به ایجنت ها",
       "ENABLE_CSAT": "فعال کردن رضایت مشتری",
       "ENABLE_CSAT_SUB_TEXT": "پس از پایان گفتگو ، نظرسنجی CSAT (رضایت مشتری) را فعال/غیرفعال کنید",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "ادامه مکالمه را از طریق ایمیل فعال کنید",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "اگر آدرس ایمیل تماس در دسترس باشد، مکالمات از طریق ایمیل ادامه خواهد یافت.",
       "INBOX_UPDATE_TITLE": "تنظیمات صندوق ورودی",
       "INBOX_UPDATE_SUB_TEXT": "تغییر پارامترهای صندوق ورودی",
       "AUTO_ASSIGNMENT_SUB_TEXT": "فعال کردن یا غیرفعال کردن واگذاری خودکار گفتگوها به ایجنت های عضو این صندوق ورودی.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "شناسه صندوق ورودی",
       "INBOX_IDENTIFIER_SUB_TEXT": "از رمز `inbox_identifier` که در اینجا نشان داده شده است برای احراز هویت کلاینت های API خود استفاده کنید.",
       "FORWARD_EMAIL_TITLE": "ارسال به ایمیل",
-      "FORWARD_EMAIL_SUB_TEXT": "ایمیل های خود را به این آدرس ها فوروارد کنید."
+      "FORWARD_EMAIL_SUB_TEXT": "ایمیل های خود را به این آدرس ها فوروارد کنید.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "اجازه دادن به پیام ها پس از حل شدن مکالمه",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "به کاربران اجازه دهید حتی پس از حل شدن مکالمه پیام ارسال کنند."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "احراز هویت مجدد",
diff --git a/app/javascript/dashboard/i18n/locale/fa/index.js b/app/javascript/dashboard/i18n/locale/fa/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/fa/index.js
+++ b/app/javascript/dashboard/i18n/locale/fa/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
index 09b436f2a..9a0134871 100644
--- a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
@@ -8,7 +8,7 @@
     "LIST": {
       "404": "هیچ برچسبی در این حساب‌کاربری وجود ندارد.",
       "TITLE": "مدیریت برچسب‌ها",
-      "DESC": "برچسب‌ها به شما اجازه می‌دهند مکالمات را با هم گروه‌بندی کنید.",
+      "DESC": "برچسب‌ها به شما اجازه می‌دهند، گفتگوها را با هم گروه‌بندی کنید.",
       "TABLE_HEADER": [
         "نام",
         "توضیحات",
diff --git a/app/javascript/dashboard/i18n/locale/fa/report.json b/app/javascript/dashboard/i18n/locale/fa/report.json
index 01f519665..8f91c4ea4 100644
--- a/app/javascript/dashboard/i18n/locale/fa/report.json
+++ b/app/javascript/dashboard/i18n/locale/fa/report.json
@@ -52,7 +52,7 @@
         "name": "پارسال"
       },
       {
-        "id": 5,
+        "id": 0,
         "name": "محدوده تاریخ سفارشی"
       }
     ],
@@ -82,11 +82,11 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "زمان تا اولین پاسخ",
-        "DESC": "( میانگین )"
+        "DESC": "« میانگین »"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "( میانگین )"
+        "DESC": "« میانگین »"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -115,7 +115,7 @@
         "name": "پارسال"
       },
       {
-        "id": 5,
+        "id": 0,
         "name": "محدوده تاریخ سفارشی"
       }
     ],
@@ -178,7 +178,7 @@
         "name": "پارسال"
       },
       {
-        "id": 5,
+        "id": 0,
         "name": "محدوده تاریخ سفارشی"
       }
     ],
@@ -208,11 +208,11 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "زمان تا اولین پاسخ",
-        "DESC": "( میانگین )"
+        "DESC": "« میانگین »"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "( میانگین )"
+        "DESC": "« میانگین »"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -225,7 +225,7 @@
         "name": "در ۷ روز گذشته"
       },
       {
-        "id": 1,
+        "id": 0,
         "name": "در ۳۰ روز گذشته"
       },
       {
@@ -241,7 +241,7 @@
         "name": "پارسال"
       },
       {
-        "id": 5,
+        "id": 0,
         "name": "محدوده تاریخ سفارشی"
       }
     ],
@@ -271,11 +271,11 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "زمان تا اولین پاسخ",
-        "DESC": "( میانگین )"
+        "DESC": "« میانگین »"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "( میانگین )"
+        "DESC": "« میانگین »"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -288,7 +288,7 @@
         "name": "در ۷ روز گذشته"
       },
       {
-        "id": 1,
+        "id": 0,
         "name": "در ۳۰ روز گذشته"
       },
       {
@@ -304,7 +304,7 @@
         "name": "پارسال"
       },
       {
-        "id": 5,
+        "id": 0,
         "name": "محدوده تاریخ سفارشی"
       }
     ],
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 5e960ac38..7c177dad3 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -33,7 +33,7 @@
         "NOTE": "اعلان های صوتی را در داشبورد برای پیام ها و مکالمات جدید فعال کنید.",
         "NONE": "هیچکدام",
         "ASSIGNED": "مکالمات اختصاص داده شده",
-        "ALL_CONVERSATIONS": "همه مکالمات"
+        "ALL_CONVERSATIONS": "همه گفتگوها"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "اعلامیه‌ به ایمیل",
@@ -68,7 +68,7 @@
       "DISPLAY_NAME": {
         "LABEL": "نام نمایشی",
         "ERROR": "لطفا یک نام نمایشی معتبر وارد کنید",
-        "PLACEHOLDER": "لطفا یک نام نمایشی وارد کنید، این نام در مکالمات نمایش داده می‌شود"
+        "PLACEHOLDER": "لطفا یک نام نمایشی وارد کنید، این نام در گفتگوها نمایش داده می‌شود"
       },
       "AVAILABILITY": {
         "LABEL": "در دسترس",
@@ -89,25 +89,25 @@
         "PLACEHOLDER": "لطفاً رمز عبور فعلی را وارد کنید"
       },
       "PASSWORD": {
-        "LABEL": "رمز عبور",
+        "LABEL": "رمز عبور جدید",
         "ERROR": "رمز عبور می‌بایست ۶ کاراکتر یا بیشتر باشد",
         "PLACEHOLDER": "لطفا رمز عبور جدیدی وارد کنید"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "تکرار رمز عبور",
         "ERROR": "تکرار رمز عبور می‌بایست با رمز عبور یکسان باشد",
-        "PLACEHOLDER": "لطفا رمز عبور را مجددا وارد کنید"
+        "PLACEHOLDER": "لطفا رمز عبور جدید را مجددا وارد کنید"
       }
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "عوض شدن",
+    "CHANGE_AVAILABILITY_STATUS": "تغییر",
     "CHANGE_ACCOUNTS": "سوییچ به یک حساب دیگر",
     "CONTACT_SUPPORT": "با پشتیبانی تماس بگیرید",
     "SELECTOR_SUBTITLE": "از لیست یکی از حساب‌ها را انتخاب کنید",
     "PROFILE_SETTINGS": "تنظیمات پروفایل",
     "KEYBOARD_SHORTCUTS": "میانبرهای صفحه‌کلید",
-    "LOGOUT": "خروج از حساب"
+    "LOGOUT": "خروج از حساب‌کاربری"
   },
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "روز تا اتمام دوره آزمایشی باقی است.",
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "ویژگی‌های سفارشی",
     "AUTOMATION": "خودکارسازی",
     "TEAMS": "تیم‌ها",
+    "CUSTOM_VIEWS_FOLDER": "پوشه‌ها",
+    "CUSTOM_VIEWS_SEGMENTS": "بخش ها",
     "ALL_CONTACTS": "تمام مخاطبین",
     "TAGGED_WITH": "برچسب گذاری شده با",
     "NEW_LABEL": "برچسب جدید",
@@ -188,7 +190,7 @@
   },
   "KEYBOARD_SHORTCUTS": {
     "TITLE": {
-      "OPEN_CONVERSATION": "باز کردن مکالمه",
+      "OPEN_CONVERSATION": "باز کردن گفتگو",
       "RESOLVE_AND_NEXT": "حل کنید و به مرحله بعدی بروید",
       "NAVIGATE_DROPDOWN": "به موارد کشویی بروید",
       "RESOLVE_CONVERSATION": "حل مکالمه",
diff --git a/app/javascript/dashboard/i18n/locale/fa/signup.json b/app/javascript/dashboard/i18n/locale/fa/signup.json
index 6f659b7a7..7baa846bb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fa/signup.json
@@ -1,12 +1,12 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "ثبت حساب",
+    "TRY_WOOT": "ثبت‌نام حساب‌کاربری",
     "TITLE": "ثبت نام",
     "TERMS_ACCEPT": "با ثبت نام، اعلام می‌دارید که <a href=\"https://www.chatwoot.com/terms\">قوانین</a> و <a href=\"https://www.chatwoot.com/privacy-policy\">شرایط استفاده</a> از این نرم افزار را تایید کرده و می‌پذیرید",
     "ACCOUNT_NAME": {
-      "LABEL": "عنوان حساب",
-      "PLACEHOLDER": "نام حساب ‌کاربری را وارد کنید. به عنوان مثال: شرکت وین",
-      "ERROR": "نام حساب ‌کاربری خیلی کوتاه است"
+      "LABEL": "نام حساب‌کاربری",
+      "PLACEHOLDER": "نام حساب‌کاربری را وارد کنید. به عنوان مثال: شرکت وین",
+      "ERROR": "نام حساب‌کاربری خیلی کوتاه است"
     },
     "FULL_NAME": {
       "LABEL": "نام کامل",
@@ -33,6 +33,6 @@
       "ERROR_MESSAGE": "ارتباط با سرور برقرار نشد، لطفا بعدا امتحان کنید"
     },
     "SUBMIT": "ثبت",
-    "HAVE_AN_ACCOUNT": "از قبل حساب ‌کاربری دارید؟"
+    "HAVE_AN_ACCOUNT": "از قبل حساب‌کاربری دارید؟"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
index 94fa5cd32..81131a359 100644
--- a/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "ایجاد تیم جدید",
     "HEADER": "تیم‌ها",
-    "SIDEBAR_TXT": "<p><b> تیمها </b> </p> <p> تیمها به شما امکان می دهند ایجنت ها خود را بر اساس مسئولیت های آنها در گروه ها سازماندهی کنید. <br /> یک کاربر می تواند بخشی از چندین تیم باشد. هنگامی که به طور مشترک کار می کنید ، می توانید مکالمات را به یک تیم اختصاص دهید. </p>",
+    "SIDEBAR_TXT": "<p><b>تیم‌ها</b></p> <p>تیم‌ها به شما امکان می‌دهند ایجنت های خود را بر اساس مسئولیت‌هایشان در گروه‌هایی سازماندهی کنید. <br /> یک ایجنت می تواند بخشی از چندین تیم باشد. وقتی به صورت مشترک کار می کنید، می توانید مکالمات را به یک تیم اختصاص دهید. </p>",
     "LIST": {
       "404": "هیچ تیمی در این حساب ایجاد نشده است.",
       "EDIT_TEAM": "ویرایش تیم"
diff --git a/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json
index 53e9aeec6..cd7194f7d 100644
--- a/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Tila",
@@ -31,7 +33,54 @@
       "LABELS": "Tunnisteet",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Mukautetut attribuutit"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Peruuta",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Vahvista poistaminen",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Kyllä, poista",
+            "NO": "Ei, säilytä"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/automation.json b/app/javascript/dashboard/i18n/locale/fi/automation.json
index c3614a990..1f3b4d674 100644
--- a/app/javascript/dashboard/i18n/locale/fi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Luo",
+      "CANCEL_BUTTON_TEXT": "Peruuta",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Kuvaus",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Toiminnot"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nimi",
+        "Kuvaus",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Poista",
+      "CANCEL_BUTTON_TEXT": "Peruuta",
+      "CONFIRM": {
+        "TITLE": "Vahvista poistaminen",
+        "MESSAGE": "Oletko varma että haluat poistaa ",
+        "YES": "Kyllä, poista ",
+        "NO": "Ei, säilytä "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Muokkaa",
+      "CANCEL_BUTTON_TEXT": "Peruuta",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Muokkaa",
+      "CREATE": "Luo",
+      "DELETE": "Poista",
+      "CANCEL": "Peruuta",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
index 81e3c669f..d9bb78ed3 100644
--- a/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Lisää tallennettu vastaus",
     "LOADING": "Haetaan tallennettuja vastauksia",
     "SEARCH_404": "Tätä hakua vastaavia kohteita ei löydy",
-    "SIDEBAR_TXT": "<p><b>Tallennetut vastaukset</b> </p><p> Tallennetut vastaukset ovat malleja, jotka on helppo valita, muokata ja lähettää vastaus keskusteluun nopeasti. </p><p> Jotta voit luoda Tallennetun vastauksen, klikkaa <b>Lisää tallennettu vastaus</b>. Voit myös muokata tai poistaa olemassa olevia tallennettuja vastauksia klikkaamalla Muokkaa- tai Poista-painiketta. </p><p> Tallennettuja vastauksia käytetään <b>oikoteiden</b> avulla. Agentit voivat käyttää vastausten säilykkeitä chatissa kirjoittamalla <b>'/'</b> ja sen perään oikotien. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Tällä tilillä ei ole tallennettuja vastauksia.",
       "TITLE": "Hallitse tallennettuja vastauksia",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Lisää tallennettu vastaus",
-      "DESC": "Tallennetut vastaukset ovat ennalta valmisteltuja vastausmalleja, joita voidaan käyttää nopeasti lähettää vastaukset keskusteluihin.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Peruuta",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Oikotie",
-          "PLACEHOLDER": "Ole hyvä ja syötä oikotie",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Oikotie on vaadittu"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 3654e0ca2..e48056de6 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Peruuta",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Näytä",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Etsi",
     "SEARCH_INPUT_PLACEHOLDER": "Etsi yhteystietoja",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Ladataan yhteystietoja...",
       "404": "Ei hakua vastaavia yhteystietoja 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/fi/contactFilters.json b/app/javascript/dashboard/i18n/locale/fi/contactFilters.json
index 7cbdad306..342fcdba7 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nimi",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Puhelinnumero",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Mukautetut attribuutit"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 3dbdad2b6..f14439b5c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Ladataan keskusteluita",
     "CANNOT_REPLY": "Et voi vastata, sillä",
     "24_HOURS_WINDOW": "24h vastausikkuna",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24h vastausikkuna",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Lähettäjä:",
+    "BOT": "Botti",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Valitse edustaja",
       "REMOVE": "Poista",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index ce844f07a..89830ae63 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Kuinka monen päivän jälkeen tukipyyntö suljetaan automaattisesti, mikäli sillä ei ole toimintaa",
         "PLACEHOLDER": "30",
-        "ERROR": "Syötä kelvollinen automaattisen ratkaisun kesto (vähintään 1 päivä)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Keskustelun jatkuvuus sähköpostin kautta on käytössä tililläsi.",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 3a8f3dde4..13ed74d16 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Ota käyttöön tervetulotoivotus",
-          "HELP_TEXT": "Lähetä käyttäjälle viesti, kun hän aloittaa keskustelun.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Käytössä",
           "DISABLED": "Pois käytöstä"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Tämä kenttä on pakollinen"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Tämä kenttä on pakollinen"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Tämä kenttä on pakollinen"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Tämä kenttä on pakollinen"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Kansion nimi",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Tämä kenttä on pakollinen"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Puhelinnumero",
+            "PLACEHOLDER": "Ole hyvä ja syötä puhelinnumero, josta viesti lähetetään.",
+            "ERROR": "Anna kelvollinen arvo. Puhelinnumeron pitäisi alkaa `+` merkillä."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Käytössä",
         "DISABLED": "Pois käytöstä"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Käytössä",
+        "DISABLED": "Pois käytöstä"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Käytössä",
+        "DISABLED": "Pois käytöstä"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Ota automaattinen delegointi käyttöön",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Postilaatikon tiedot",
       "INBOX_UPDATE_SUB_TEXT": "Päivitä postilaatikon asetukset",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ota käyttöön tai poista käytöstä automaattinen keskusteluiden delegointi edustajille.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Aloita välittämällä sähköpostit seuraavaan osoitteeseen."
+      "FORWARD_EMAIL_SUB_TEXT": "Aloita välittämällä sähköpostit seuraavaan osoitteeseen.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Uudelleenvaltuuta",
diff --git a/app/javascript/dashboard/i18n/locale/fi/index.js b/app/javascript/dashboard/i18n/locale/fi/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/fi/index.js
+++ b/app/javascript/dashboard/i18n/locale/fi/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index b8608e6d6..240a8b0db 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Salasana",
+        "LABEL": "New password",
         "ERROR": "Anna salasana jonka pituus on 6 tai enemmän",
         "PLACEHOLDER": "Anna uusi salasana"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Vahvista salasana",
         "ERROR": "Salasanat eivät täsmää",
-        "PLACEHOLDER": "Syötä salasana uudelleen"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Mukautetut attribuutit",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
index 21565fe3e..80b0f69ae 100644
--- a/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json
index ed6c424f6..33ca8836c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "État",
@@ -31,7 +33,54 @@
       "LABELS": "Étiquettes",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Attributs personnalisés"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Le nom est requis",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Annuler",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirmer la suppression",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Oui, supprimer",
+            "NO": "Non, conservez-le"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/automation.json b/app/javascript/dashboard/i18n/locale/fr/automation.json
index c3614a990..47a46d79d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Créer",
+      "CANCEL_BUTTON_TEXT": "Annuler",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Le nom est requis"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "La description est requise"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nom",
+        "Description",
+        "Actif",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Supprimer",
+      "CANCEL_BUTTON_TEXT": "Annuler",
+      "CONFIRM": {
+        "TITLE": "Confirmer la suppression",
+        "MESSAGE": "Êtes-vous sûr de vouloir supprimer ",
+        "YES": "Oui, supprimer ",
+        "NO": "Non, Conserver "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Modifier",
+      "CANCEL_BUTTON_TEXT": "Annuler",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Modifier",
+      "CREATE": "Créer",
+      "DELETE": "Supprimer",
+      "CANCEL": "Annuler",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json
index 8d0309245..6e89d7a09 100644
--- a/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Ajouter une réponse standardisée",
     "LOADING": "Récupération des réponses standardisées",
     "SEARCH_404": "Il n'y a aucun élément correspondant à cette requête",
-    "SIDEBAR_TXT": "<p><b>Réponses standardisées</b> </p><p> Les réponses standardisées sont des modèles de réponse qui peuvent être utilisés pour envoyer rapidement une réponse à une conversation. </p><p> Pour créer une réponse standardisée, il suffit de cliquer sur <b>Ajouter une réponse standardisée</b>. Vous pouvez également modifier ou supprimer une réponse standardisée existante en cliquant sur le bouton Modifier ou Supprimer </p><p> Les réponses standardisées sont utilisées à l'aide de <b>raccourcis</b>. Les agents peuvent accéder aux réponses standardisées pendant une conversation en tapant <b>'/'</b> suivi du raccourci. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Il n'y a aucune réponse standardisée disponible dans ce compte.",
       "TITLE": "Gérer les réponses standardisées",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Ajouter une réponse standardisée",
-      "DESC": "Les réponses standardisées sont des modèles de réponse qui peuvent être utilisés pour envoyer rapidement une réponse à la conversation.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Annuler",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Raccourcis",
-          "PLACEHOLDER": "Veuillez entrer un raccourci",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Le raccourci est requis"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 7971aefde..8db9da164 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Envoyer un message",
       "CANCEL": "Annuler",
       "SUCCESS_MESSAGE": "Message envoyé !",
+      "GO_TO_CONVERSATION": "Voir",
       "ERROR_MESSAGE": "Impossible d'envoyer ! Veuillez réessayer"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Rechercher",
     "SEARCH_INPUT_PLACEHOLDER": "Rechercher des contacts",
     "FILTER_CONTACTS": "Filtrer",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Chargement des contacts...",
       "404": "Aucun contact ne correspond à votre recherche 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/fr/contactFilters.json b/app/javascript/dashboard/i18n/locale/fr/contactFilters.json
index cac596051..393d12ffd 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nom",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Numéro de téléphone",
             "IDENTIFIER": "Identifier",
             "CITY": "Ville",
-            "COUNTRY": "Pays"
+            "COUNTRY": "Pays",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Attributs personnalisés"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 4a9f52164..a057c7622 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Chargement des conversations",
     "CANNOT_REPLY": "Vous ne pouvez pas répondre en raison de",
     "24_HOURS_WINDOW": "Restriction de fenêtre de message de 24 heures",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "M’assigner la conversation",
     "TWILIO_WHATSAPP_CAN_REPLY": "Vous pouvez seulement répondre à cette conversation en utilisant un modèle de message en raison de",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restriction de fenêtre de message de 24 heures",
     "SELECT_A_TWEET_TO_REPLY": "Veuillez sélectionner un tweet auquel répondre.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Le fichier dépasse la limite de {MAXIMUM_FILE_UPLOAD_SIZE} pour les pièces jointes",
     "MESSAGE_ERROR": "Impossible d'envoyer ce message, veuillez réessayer plus tard",
     "SENT_BY": "Envoyé par:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Sélectionner un agent",
       "REMOVE": "Supprimer",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invitez les membres de votre équipe",
-      "DESCRIPTION": "Puisque vous vous apprêtez à parler à votre client, faites venir vos coéquipiers pour vous aider. Vous pouvez inviter vos coéquipiers en ajoutant leur adresse email à la liste des agents.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Cliquez ici pour inviter un membre de l'équipe"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index eb163f191..2220873c8 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Nombre de jours après qu'un ticket soit automatiquement résolu s'il n'y a pas d'activité",
         "PLACEHOLDER": "30",
-        "ERROR": "Veuillez entrer une durée de résolution automatique valide (minimum 1 jour)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "La continuité des conversations avec les courriels est activée pour votre compte.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index f6cad4662..ebf71c3d0 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Activer l'accueil du canal",
-          "HELP_TEXT": "Envoyer un message de bienvenue à l'utilisateur lorsqu'il démarre la conversation.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Activé",
           "DISABLED": "Désactivé"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "Canal SMS via Twilio",
-        "DESC": "Commencez à assister vos clients par SMS avec l'intégration Twilio."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Ce champ est requis"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Ce champ est requis"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Ce champ est requis"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Ce champ est requis"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nom de la boîte de réception",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Ce champ est requis"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Numéro de téléphone",
+            "PLACEHOLDER": "Veuillez entrer le numéro de téléphone à partir duquel le message sera envoyé.",
+            "ERROR": "Veuillez entrer une valeur valide. Le numéro de téléphone doit commencer par le signe `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "URL de rappel (callback)",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Activé",
         "DISABLED": "Désactivé"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Activé",
+        "DISABLED": "Désactivé"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Activé",
+        "DISABLED": "Désactivé"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Activer"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Activer l'assignation automatique",
       "ENABLE_CSAT": "Activer CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Activer/Désactiver l'enquête CSAT(satisfaction du client) après avoir résolu une conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Paramètres de boîtes de réception",
       "INBOX_UPDATE_SUB_TEXT": "Mettre à jour les paramètres de votre boîte de réception",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activer ou désactiver l'affectation automatique de nouvelles conversations aux agents ajoutés à cette boîte de réception.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Identificateur de la boîte de réception",
       "INBOX_IDENTIFIER_SUB_TEXT": "Utilisez le jeton `inbox_identifier` affiché ici pour authentifier vos clients API.",
       "FORWARD_EMAIL_TITLE": "Transférer par e-mail",
-      "FORWARD_EMAIL_SUB_TEXT": "Commencez à transférer vos courriels à l'adresse suivante."
+      "FORWARD_EMAIL_SUB_TEXT": "Commencez à transférer vos courriels à l'adresse suivante.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Réautoriser",
diff --git a/app/javascript/dashboard/i18n/locale/fr/index.js b/app/javascript/dashboard/i18n/locale/fr/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/fr/index.js
+++ b/app/javascript/dashboard/i18n/locale/fr/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 9f42bc8ff..38f0d3bc2 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Veuillez entrer le mot de passe actuel"
       },
       "PASSWORD": {
-        "LABEL": "Mot de passe",
+        "LABEL": "New password",
         "ERROR": "Veuillez entrer un mot de passe de 6 caractères ou plus",
         "PLACEHOLDER": "Veuillez entrer un nouveau mot de passe"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirmer le nouveau mot de passe",
         "ERROR": "La confirmation du mot de passe doit correspondre au mot de passe",
-        "PLACEHOLDER": "Veuillez saisir à nouveau votre mot de passe"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Attributs personnalisés",
     "AUTOMATION": "Automation",
     "TEAMS": "Équipes",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Tous les contacts",
     "TAGGED_WITH": "Tagué avec",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
index 79b7d5678..b65256d14 100644
--- a/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Créer une nouvelle équipe",
     "HEADER": "Équipes",
-    "SIDEBAR_TXT": "<p><b>Équipes</b></p> <p>Les équipes vous permettent d'organiser vos agents en groupes en fonction de leurs responsabilités. <br /> Un utilisateur peut faire partie de plusieurs équipes. Vous pouvez assigner des conversations à une équipe lorsque vous travaillez en collaboration. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "Il n'y a aucune équipe créée sur ce compte.",
       "EDIT_TEAM": "Modifier l'équipe"
diff --git a/app/javascript/dashboard/i18n/locale/he/advancedFilters.json b/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
index 562d36673..ccc5b7d89 100644
--- a/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "מצב",
@@ -31,7 +33,54 @@
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "מאפיינים בהתאמה אישית"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "שם שדה חובה",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "ביטול",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "אשר מחיקה",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "כן, מחק",
+            "NO": "לא, השאר"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/automation.json b/app/javascript/dashboard/i18n/locale/he/automation.json
index c3614a990..f16a3fc19 100644
--- a/app/javascript/dashboard/i18n/locale/he/automation.json
+++ b/app/javascript/dashboard/i18n/locale/he/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "צור",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "שם שדה חובה"
+        },
+        "DESC": {
+          "LABEL": "תיאור",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "נדרש תיאור"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "בבקשה תבחר אחד",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "פעולות"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "שם",
+        "תיאור",
+        "פעיל",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "מחק",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "CONFIRM": {
+        "TITLE": "אשר מחיקה",
+        "MESSAGE": "האם אתה בטוח שברצונך למחוק ",
+        "YES": "כן, מחק ",
+        "NO": "לא, השאר "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "ערוך",
+      "CANCEL_BUTTON_TEXT": "ביטול",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "ערוך",
+      "CREATE": "צור",
+      "DELETE": "מחק",
+      "CANCEL": "ביטול",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
index 24b8ac7b1..ce349ac97 100644
--- a/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "הוסף תגובה מוכנה",
     "LOADING": "מביא תגובות שמורות",
     "SEARCH_404": "אין פריטים התואמים לשאילתה זו",
-    "SIDEBAR_TXT": "<p><b>תגובות מוכנות</b> </p><p> תגובות מוכנות הן תבניות תשובה שמורות בהן ניתן להשתמש כדי לשלוח תשובה מהירה לשיחה . </p><p> ליצירת תגובה מוכנה, פשוט לחץ על <b>הוסף תגובה מוכנה</b>. אתה יכול גם לערוך או למחוק תגובה מוכנה קיימת על ידי לחיצה על הלחצן ערוך או מחק </p><p> תגובות מוכנות משמשות בעזרת <b>קודים קצרים</b>. סוכנים יכולים לגשת לתגובות מוכנות בזמן צ'אט על ידי הקלדת <b>'/'</b> ואחריה הקוד הקצר. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "אין תגובות מוכנות זמינות בחשבון זה.",
       "TITLE": "נהל תגובות מוכנות",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "הוסף תגובה מוכנה",
-      "DESC": "תגובות מוכנות הן תבניות תשובה שמורות בהן ניתן להשתמש כדי לשלוח במהירות תשובה לשיחה.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "קוד קצר",
-          "PLACEHOLDER": "נא להזין קוד קצר",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "קוד קצר נדרש"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index 2e846305d..fb937508e 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "שלח הודעה",
       "CANCEL": "ביטול",
       "SUCCESS_MESSAGE": "הודעה נשלחה!",
+      "GO_TO_CONVERSATION": "צפה",
       "ERROR_MESSAGE": "לא ניתן לשלוח! נסה שוב"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "חפש",
     "SEARCH_INPUT_PLACEHOLDER": "חפש איש קשר",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "טוען אנשי קשר...",
       "404": "אין אנשי קשר שתואמים לחיפוש שלך 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/he/contactFilters.json b/app/javascript/dashboard/i18n/locale/he/contactFilters.json
index 5e7bea3b3..6e1caf083 100644
--- a/app/javascript/dashboard/i18n/locale/he/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/he/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "שם",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "מספר טלפון",
             "IDENTIFIER": "Identifier",
             "CITY": "עיר",
-            "COUNTRY": "מדינה"
+            "COUNTRY": "מדינה",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "מאפיינים בהתאמה אישית"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 735f7b5dc..8676d1e59 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "טוען שיחות",
     "CANNOT_REPLY": "לא ניתן להשיב עקב",
     "24_HOURS_WINDOW": "הגבלת חלון הודעות של 24 שעות",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "אתה יכול להשיב לשיחה זו רק באמצעות הודעת תבנית בשל",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "הגבלת חלון הודעות של 24 שעות",
     "SELECT_A_TWEET_TO_REPLY": "אנא בחר ציוץ להשיב.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "קובץ חורג ממגבלת גודל מקסימלי {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "נשלח על ידי:",
+    "BOT": "בוט",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "בחר סוכן",
       "REMOVE": "Remove",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 2e6596b24..ba08ffb72 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "מספר הימים לאחר כרטיס אמור להיפתר אוטומטית אם אין פעילות",
         "PLACEHOLDER": "30",
-        "ERROR": "אנא הזן משך פתרון אוטומטי חוקי (מינימום יום אחד)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "רציפות השיחה עם הודעות אימייל מופעלת עבור החשבון שלך.",
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index be987da84..19492c38d 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "אפשר ברכה בערוץ",
-          "HELP_TEXT": "שלח הודעת ברכה למשתמש כאשר הוא מתחיל את השיחה.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "מופעל",
           "DISABLED": "כבוי"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "ערוץ SMS דרך Twilio",
-        "DESC": "התחל לתמוך בלקוחות שלך באמצעות SMS עם שילוב Twilio."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "ספק API",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "שדה חובה"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "שדה חובה"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "שדה חובה"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "שדה חובה"
+          },
+          "INBOX_NAME": {
+            "LABEL": "שם תיבת הדואר הנכנס",
+            "PLACEHOLDER": "נא להזין שם תיבת דואר נכנס",
+            "ERROR": "שדה חובה"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "מספר טלפון",
+            "PLACEHOLDER": "נא להזין את מספר הטלפון שממנו תישלח ההודעה.",
+            "ERROR": "אנא הכנס ערך תקין. מספר הטלפון צריך להתחיל בסימן '+'."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "כתובת אתר להתקשרות חוזרת",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "ערוץ וואטסאפ",
@@ -305,6 +353,14 @@
         "ENABLED": "מופעל",
         "DISABLED": "כבוי"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "מופעל",
+        "DISABLED": "כבוי"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "מופעל",
+        "DISABLED": "כבוי"
+      },
       "ENABLE_HMAC": {
         "LABEL": "אפשר"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "אפשר הקצאה אוטומטית",
       "ENABLE_CSAT": "אפשר CSAT",
       "ENABLE_CSAT_SUB_TEXT": "הפעל/השבת סקר CSAT (שביעות רצון לקוחות) לאחר פתרון שיחה",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "הגדרות תיבת דואר נכנס",
       "INBOX_UPDATE_SUB_TEXT": "עדכן את הגדרות תיבת הדואר הנכנס שלך",
       "AUTO_ASSIGNMENT_SUB_TEXT": "אפשר או השבת את ההקצאה האוטומטית של שיחות חדשות לסוכנים שנוספו לתיבת הדואר הנכנס הזו.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "מזהה תיבת דואר נכנס",
       "INBOX_IDENTIFIER_SUB_TEXT": "השתמש ב-'inbox_identifier' המוצג כאן כדי לאמת את לקוחות ה-API שלך.",
       "FORWARD_EMAIL_TITLE": "העבר לדואר אלקטרוני",
-      "FORWARD_EMAIL_SUB_TEXT": "התחל להעביר את המיילים שלך לכתובת הדוא\"ל הבאה."
+      "FORWARD_EMAIL_SUB_TEXT": "התחל להעביר את המיילים שלך לכתובת הדוא\"ל הבאה.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "הרשאה מחדש",
diff --git a/app/javascript/dashboard/i18n/locale/he/index.js b/app/javascript/dashboard/i18n/locale/he/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/he/index.js
+++ b/app/javascript/dashboard/i18n/locale/he/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 5212d76a6..3b5be6530 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "סיסמה",
+        "LABEL": "New password",
         "ERROR": "Please enter a password of length 6 or more",
         "PLACEHOLDER": "Please enter a new password"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirm new password",
         "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your password"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "מאפיינים בהתאמה אישית",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/he/teamsSettings.json b/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
index 7735dc1c3..5721c761f 100644
--- a/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json
index f2292db8e..f00973f29 100644
--- a/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Custom Attributes"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Cancel",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirm Deletion",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Yes, Delete",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/automation.json b/app/javascript/dashboard/i18n/locale/hi/automation.json
index c3614a990..ee78de7c8 100644
--- a/app/javascript/dashboard/i18n/locale/hi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Edit",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hi/cannedMgmt.json
index bcab1dc6a..9c14f5a52 100644
--- a/app/javascript/dashboard/i18n/locale/hi/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Add Canned Response",
     "LOADING": "Fetching Canned Responses",
     "SEARCH_404": "There are no items matching this query",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation . </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "There are no canned responses available in this account.",
       "TITLE": "Manage canned responses",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Add Canned Response",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Short Code is required"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index baa7c8d7d..3824d9593 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Cancel",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "View",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/hi/contactFilters.json b/app/javascript/dashboard/i18n/locale/hi/contactFilters.json
index 8ebe460bb..a752d537c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Name",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Phone number",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index 9e2e3ea08..c545502ec 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Loading Conversations",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Remove",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index 0d13ee4a3..a04e3d49b 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Phone number",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reauthorize",
diff --git a/app/javascript/dashboard/i18n/locale/hi/index.js b/app/javascript/dashboard/i18n/locale/hi/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/hi/index.js
+++ b/app/javascript/dashboard/i18n/locale/hi/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 4d338baa7..4de2ffb74 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Password",
+        "LABEL": "New password",
         "ERROR": "Please enter a password of length 6 or more",
         "PLACEHOLDER": "Please enter a new password"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirm new password",
         "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your password"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
index 44c843815..8edff5699 100644
--- a/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
index e8c503b2a..edcb993aa 100644
--- a/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Státusz",
@@ -31,7 +33,54 @@
       "LABELS": "Cimkék",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Egyedi atribútumok"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Mégse",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Törlés megerősítése",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Igen, Törlés",
+            "NO": "Nem, tartsa meg"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
index d3848b234..b82f242b3 100644
--- a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
@@ -95,17 +95,17 @@
     "MULTI_SELECTOR": {
       "PLACEHOLDER": "Nincs",
       "TITLE": {
-        "AGENT": "Select agent",
-        "TEAM": "Select team"
+        "AGENT": "Ügynök kiválasztása",
+        "TEAM": "Csapat kiválasztása"
       },
       "SEARCH": {
         "NO_RESULTS": {
           "AGENT": "Nem találunk ügynököt",
-          "TEAM": "No teams found"
+          "TEAM": "Nem találtunk csapatot"
         },
         "PLACEHOLDER": {
-          "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "AGENT": "Ügynökök keresése",
+          "TEAM": "Csapatok keresése"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/hu/automation.json b/app/javascript/dashboard/i18n/locale/hu/automation.json
index c3614a990..64c971836 100644
--- a/app/javascript/dashboard/i18n/locale/hu/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Létrehozás",
+      "CANCEL_BUTTON_TEXT": "Mégse",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Leírás",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Műveletek"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Név",
+        "Leírás",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Törlés",
+      "CANCEL_BUTTON_TEXT": "Mégse",
+      "CONFIRM": {
+        "TITLE": "Törlés megerősítése",
+        "MESSAGE": "Biztos abban, hogy törli ",
+        "YES": "Igen, Törlés ",
+        "NO": "Nem, Mégse "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Szerkesztés",
+      "CANCEL_BUTTON_TEXT": "Mégse",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Szerkesztés",
+      "CREATE": "Létrehozás",
+      "DELETE": "Törlés",
+      "CANCEL": "Mégse",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/campaign.json b/app/javascript/dashboard/i18n/locale/hu/campaign.json
index aaac8ac72..bc983767e 100644
--- a/app/javascript/dashboard/i18n/locale/hu/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/hu/campaign.json
@@ -89,7 +89,7 @@
       "TABLE_HEADER": {
         "TITLE": "Title",
         "MESSAGE": "Üzenet",
-        "INBOX": "Inbox",
+        "INBOX": "Fiók",
         "STATUS": "Státusz",
         "SENDER": "Sender",
         "URL": "URL",
@@ -98,7 +98,7 @@
         "CREATED_AT": "Created at"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "Hozzáadás",
         "EDIT": "Szerkesztés",
         "DELETE": "Törlés"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
index 2e3e5313c..4ef7edc8a 100644
--- a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Mentett válasz hozzáadása",
     "LOADING": "Mentett válaszok letöltése",
     "SEARCH_404": "Nincs megfelelő elem",
-    "SIDEBAR_TXT": "<p><b>Mentett válaszok</b> </p><p>  A mentett válaszok sablonok, melyeket gyors válaszok kiküldésére használhatsz.  </p><p> Mentett válasz létrehozásához kattints a <b>Mentett válasz létrehozása</b>-ra. Szerkesztheted vagy törölheted is a mentett válaszokat a Szerkesztés és Törlés gombokkal. A mentett válaszokat <b>rövidkódok</b> segítéségével használhatod. Az ügynökök a <b>'/'</b> jel begépelésével és a megfelelő rövidkód begépelésével férhetnek hozzá a válaszokhoz.</p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Nincs megfelelő mentett válasz ebben a fiókban.",
       "TITLE": "Mentett válaszok kezelése",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Mentett válasz hozzáadása",
-      "DESC": "A mentett válaszok előre meghatározott sablonok, melyeket gyors válaszok kiküldésére használhatsz .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Mégse",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Rövidkód",
-          "PLACEHOLDER": "Kérjük adj meg egy Rövidkódot",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Rövidkód szükséges"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
index 6d86200a1..460995146 100644
--- a/app/javascript/dashboard/i18n/locale/hu/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -7,7 +7,7 @@
       "404": "Nincs aktív üzenetváltás ebben a csoportban."
     },
     "TAB_HEADING": "Beszélgetések",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "Megemlítések",
     "SEARCH": {
       "INPUT": "Keresés: emberek, beszélgetése, mentett válaszok .."
     },
@@ -47,10 +47,10 @@
         "TEXT": "Megoldva"
       },
       "pending": {
-        "TEXT": "Pending"
+        "TEXT": "Függőben lévő"
       },
       "snoozed": {
-        "TEXT": "Snoozed"
+        "TEXT": "Elnémított"
       }
     },
     "ATTACHMENTS": {
@@ -76,10 +76,10 @@
     "RECEIVED_VIA_EMAIL": "E-mailen keresztül érkezett",
     "VIEW_TWEET_IN_TWITTER": "Üzenet megtekintése Twitteren",
     "REPLY_TO_TWEET": "Válasz",
-    "SENT": "Sent successfully",
+    "SENT": "Sikeresen elküldve",
     "NO_MESSAGES": "Nincs üzenet",
     "NO_CONTENT": "Nincs elérhető tartalom",
-    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "HIDE_QUOTED_TEXT": "Idézett szöveg eltűntetése",
+    "SHOW_QUOTED_TEXT": "Idézett szöveg megjelenítése"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index a9d827284..9a0c41a71 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "Cég",
     "LOCATION": "Hely",
     "CONVERSATION_TITLE": "Beszélgetés részletei",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "Profil megtekintése",
     "BROWSER": "Böngésző",
     "OS": "Operációs rendszer",
     "INITIATED_FROM": "Kezdeményezve",
@@ -20,8 +20,8 @@
     },
     "LABELS": {
       "CONTACT": {
-        "TITLE": "Contact Labels",
-        "ERROR": "Couldn't update labels"
+        "TITLE": "Kapcsolattartó címkéi",
+        "ERROR": "Nem lehetett frissíteni a címkéket"
       },
       "CONVERSATION": {
         "TITLE": "Beszélgetés cimkék",
@@ -33,8 +33,8 @@
         "NO_RESULT": "Nem találtunk címkét"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
+    "MERGE_CONTACT": "Kapcsolattartók összevonása",
+    "CONTACT_ACTIONS": "Kapcsolattartói tevékenységek",
     "MUTE_CONTACT": "Beszélgetés elnémítása",
     "UNMUTE_CONTACT": "Beszélgetés elnémításának feloldása",
     "MUTED_SUCCESS": "A beszélgetés 6 órára elnémítva",
@@ -43,7 +43,7 @@
     "EDIT_LABEL": "Szerkesztés",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Egyedi atribútumok",
-      "CONTACT_LABELS": "Contact Labels",
+      "CONTACT_LABELS": "Kontakt címkéi",
       "PREVIOUS_CONVERSATIONS": "Korábbi beszélgetések"
     }
   },
@@ -58,32 +58,32 @@
     "DESC": "Alapvető információ a kontaktról."
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "Import",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "BUTTON_LABEL": "Importálás",
+    "TITLE": "Kontaktok importálása",
+    "DESC": "Kontaktok importálása CSV fájlból.",
+    "DOWNLOAD_LABEL": "Minta CSV fájl letöltése.",
     "FORM": {
-      "LABEL": "CSV File",
-      "SUBMIT": "Import",
+      "LABEL": "CSV fájl",
+      "SUBMIT": "Importálás",
       "CANCEL": "Mégse"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "Kontaktok sikeresen elmentve",
     "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
   },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "Kontakt Törlése",
+    "TITLE": "Kontakt törlése",
+    "DESC": "Kontakt részletek törlése",
     "CONFIRM": {
       "TITLE": "Törlés megerősítése",
       "MESSAGE": "Biztos abban, hogy törli ",
-      "PLACE_HOLDER": "Please type {contactName} to confirm",
+      "PLACE_HOLDER": "Kérlek gépeld be, hogy {contactName} a megerősítéshez",
       "YES": "Igen, Törlés ",
       "NO": "Nem, Mégse "
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "Kontakt sikeresen törölve",
+      "ERROR_MESSAGE": "A kontakt törlése nem lehetséges. Kérjük próbáld később."
     }
   },
   "CONTACT_FORM": {
@@ -111,7 +111,7 @@
         "LABEL": "Telefonszám",
         "HELP": "A telefonszámnak E.164 formátumúnak kell lennie, pl: +[+][országkód][körzetszám][helyi telefonszám]",
         "ERROR": "A telefonszámnak üresnek vagy E.164 formátumúnak kell lennie",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "Ez a telefonszám már egy másik kontakthoz tartozik."
       },
       "LOCATION": {
         "PLACEHOLDER": "A kontakt helyének megadása",
@@ -150,38 +150,41 @@
     "NO_INBOX": "Nem találtam postafiókot, hogy új beszélgetést kezdeményezzek ezzel a kapcsolattal.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "Ide"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Fiók",
+        "ERROR": "Válassz egy fiókot"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "Tárgy",
+        "PLACEHOLDER": "Tárgy",
+        "ERROR": "A tárgy nem lehet üres"
       },
       "MESSAGE": {
         "LABEL": "Üzenet",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "PLACEHOLDER": "Írd ide üzeneted",
+        "ERROR": "Az üzenet nem lehet üres"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "Üzenet elküldése",
       "CANCEL": "Mégse",
-      "SUCCESS_MESSAGE": "Message sent!",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "SUCCESS_MESSAGE": "Üzenet elküldve!",
+      "GO_TO_CONVERSATION": "Megtekintés",
+      "ERROR_MESSAGE": "Nem sikerült az elküldés! Kérjük próbáld később"
     }
   },
   "CONTACTS_PAGE": {
     "HEADER": "Kontaktok",
-    "FIELDS": "Contact fields",
+    "FIELDS": "Kontakt mezői",
     "SEARCH_BUTTON": "Keresés",
     "SEARCH_INPUT_PLACEHOLDER": "Kontaktok keresése",
-    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS": "Szűrő",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Kontaktok betöltése...",
       "404": "Nincs a keresésnek megfelelő kontakt 🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "NO_CONTACTS": "Nincsenek elérhető kontaktok",
       "TABLE_HEADER": {
         "NAME": "Név",
         "PHONE_NUMBER": "Telefonszám",
@@ -198,43 +201,43 @@
   },
   "CONTACT_PROFILE": {
     "BACK_BUTTON": "Kontaktok",
-    "LOADING": "Loading contact profile..."
+    "LOADING": "A kontakt profiljának betöltése..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
-      "TITLE": "Shift + Enter to create a task"
+      "BUTTON": "Hozzáadás",
+      "TITLE": "Shift + Enter egy feladat létrehozásához"
     },
     "FOOTER": {
-      "DUE_DATE": "Due date",
-      "LABEL_TITLE": "Set type"
+      "DUE_DATE": "Lejárati idő",
+      "LABEL_TITLE": "Típus megadása"
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "Megjegyzések letöltése...",
+    "NOT_AVAILABLE": "Ehhez a kontakthoz nincs megjegyzés létrehozva",
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "Megjegyzések"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "hozzáadott egy megjegyzést"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "Hozzáadás",
+      "PLACEHOLDER": "Megjegyzés hozzáadása",
+      "TITLE": "Shift + Enter egy megjegyzés létrehozásához"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Megjegyzés törlése"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "Tevékenységek"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notes",
-      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_NOTES": "megjegyzések",
+      "PILL_BUTTON_EVENTS": "események",
       "PILL_BUTTON_CONVO": "beszélgetések"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/hu/contactFilters.json b/app/javascript/dashboard/i18n/locale/hu/contactFilters.json
index 9e74b56c9..4934fe147 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Név",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefonszám",
             "IDENTIFIER": "Identifier",
             "CITY": "Város",
-            "COUNTRY": "Ország"
+            "COUNTRY": "Ország",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Egyedi atribútumok"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 72ad29771..876ada502 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Beszélgetések betöltése",
     "CANNOT_REPLY": "Nem tudunk válaszolni, mivel",
     "24_HOURS_WINDOW": "24 órás üzeneti ablak megkötés",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "Erre a beszélgetésre csak konzerv válasszal válaszolhatsz, mert",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 órás üzeneti ablak megkötés",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "A file mérete meghaladja a {MAXIMUM_FILE_UPLOAD_SIZE} limitet",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Küldő:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Ügynök kiválasztása",
       "REMOVE": "Eltávolítás",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Hívd meg csapattagjaidat",
-      "DESCRIPTION": "Mivel éppen ügyféllel készülsz beszélni, hívd meg a csapattagjaidat, hogy segítségül legyenek. Az e-mailcímük ügynöklistába való megadásával tudod meghívni őket.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Kattints ide csapattag meghívásához"
     },
     "INBOXES": {
@@ -164,7 +169,7 @@
       "ERROR": "Unable to update attribute. Please try again later"
     },
     "ADD": {
-      "TITLE": "Add",
+      "TITLE": "Hozzáadás",
       "SUCCESS": "Attribute added successfully",
       "ERROR": "Unable to add attribute. Please try again later"
     },
@@ -179,7 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
-    "TO": "To",
+    "TO": "Ide",
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 6e6ff7002..de90216d1 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "A napok száma, mely után a ticketek automatikusan megoldódnak, ha nincs aktivitás",
         "PLACEHOLDER": "30",
-        "ERROR": "Kérjük helyes auto megoldási időszakot adj meg (minimum 1 nap)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A beszélgetésfolytonosság e-maillel már elérhető a fiókodban.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 543a537ce..a8a76260d 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Csatorna köszöntés engedélyezése",
-          "HELP_TEXT": "Üdvözlő üzenet küldése a felhasználónak, amikor beszélgetést indít.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Engedélyezve",
           "DISABLED": "Letiltva"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Ez a mező kötelező"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Ez a mező kötelező"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Ez a mező kötelező"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Ez a mező kötelező"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Fiók név",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Ez a mező kötelező"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefonszám",
+            "PLACEHOLDER": "Kérjük add meg a telefonszámot, amire az üzeneteket küldjük.",
+            "ERROR": "Kérjük helyes értéket adj meg. A telefonszám a '+' jellel kezdődjön."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Visszahívás URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Engedélyezve",
         "DISABLED": "Letiltva"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Engedélyezve",
+        "DISABLED": "Letiltva"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Engedélyezve",
+        "DISABLED": "Letiltva"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Automata hozzárendelés engedélyezése",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Fiókbeállítások",
       "INBOX_UPDATE_SUB_TEXT": "Frissítsd az inbox beállításaidat",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bekapcsolása vagy kikapcsolása az inboxhoz kapcsolódó automatikus ügynökhozzárendelésnek új beszélgetések esetén.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Kezdd el továbbítani az e-maileket a következő e-mail címekre."
+      "FORWARD_EMAIL_SUB_TEXT": "Kezdd el továbbítani az e-maileket a következő e-mail címekre.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Újraengedélyezés",
diff --git a/app/javascript/dashboard/i18n/locale/hu/index.js b/app/javascript/dashboard/i18n/locale/hu/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/hu/index.js
+++ b/app/javascript/dashboard/i18n/locale/hu/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrationApps.json b/app/javascript/dashboard/i18n/locale/hu/integrationApps.json
index f9ecce799..face25eeb 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrationApps.json
@@ -30,7 +30,7 @@
     },
     "LIST": {
       "FETCHING": "Fetching integration hooks",
-      "INBOX": "Inbox",
+      "INBOX": "Fiók",
       "DELETE": {
         "BUTTON_TEXT": "Törlés"
       }
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index bd2512ca6..099a0b881 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -3,9 +3,9 @@
     "LINK": "Profilbeállítások",
     "TITLE": "Profilbeállítások",
     "BTN_TEXT": "Profil frissítése",
-    "DELETE_AVATAR": "Delete Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
+    "DELETE_AVATAR": "Avatár Törlése",
+    "AVATAR_DELETE_SUCCESS": "Az avatár sikeresen törlésre került",
+    "AVATAR_DELETE_FAILED": "Hiba lépett fel az avatár törlése során, kérjük próbáld újra",
     "UPDATE_SUCCESS": "A fiókod sikeresen frissítetted",
     "PASSWORD_UPDATE_SUCCESS": "A jelszavad sikeresen megváltoztattad",
     "AFTER_EMAIL_CHANGED": "A profilod sikeresen frissítésre került, kérjük lépj be újra, mivel megváltoztak a belépési adataid",
@@ -32,8 +32,8 @@
         "TITLE": "Hangüzenetek",
         "NOTE": "Hangüzenetek engedélyezése a vezérlőpulton új üzenetek és beszélgetések esetén.",
         "NONE": "Nincs",
-        "ASSIGNED": "Assigned Conversations",
-        "ALL_CONVERSATIONS": "All Conversations"
+        "ASSIGNED": "Hozzárendelt Beszélgetések",
+        "ALL_CONVERSATIONS": "Beszélgetések"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "E-mail értesítések",
@@ -84,19 +84,19 @@
         "PLACEHOLDER": "Kérjük add meg az e-mailcímet amit a beszélgetésekben szeretnél megjeleníteni"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
-        "ERROR": "Please enter the current password",
-        "PLACEHOLDER": "Please enter the current password"
+        "LABEL": "Jelenlegi jelszó",
+        "ERROR": "Kérjük add meg a jelenlegi jelszavad",
+        "PLACEHOLDER": "Kérjük add meg a jelenlegi jelszavad"
       },
       "PASSWORD": {
-        "LABEL": "Jelszó",
+        "LABEL": "Új jelszó",
         "ERROR": "Kérjük 6 karakternél hosszabb jelszót adj meg",
         "PLACEHOLDER": "Kérjük adj meg egy új jelszót"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Jelszó megerősítése",
         "ERROR": "A két jelszónak egyeznie kell",
-        "PLACEHOLDER": "Kérjük add meg egy ismét a jelszót"
+        "PLACEHOLDER": "Kérjük add meg egy ismét új jelszavad"
       }
     }
   },
@@ -135,8 +135,8 @@
   },
   "SIDEBAR": {
     "CONVERSATIONS": "Beszélgetések",
-    "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "ALL_CONVERSATIONS": "Beszélgetések",
+    "MENTIONED_CONVERSATIONS": "Megemlítések",
     "REPORTS": "Jelentések",
     "SETTINGS": "Beállítások",
     "CONTACTS": "Kontaktok",
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Egyedi atribútumok",
     "AUTOMATION": "Automation",
     "TEAMS": "Csapatok",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
@@ -165,7 +167,7 @@
     "ONE_OFF": "One off",
     "REPORTS_AGENT": "Ügynökök",
     "REPORTS_LABEL": "Cimkék",
-    "REPORTS_INBOX": "Inbox",
+    "REPORTS_INBOX": "Fiók",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as"
   },
diff --git a/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
index 1b12b20d5..824218f6b 100644
--- a/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Új csapat hozzárendelése",
     "HEADER": "Csapatok",
-    "SIDEBAR_TXT": "<p><b>Csapatok</b></p><p>A csapatok lehetővé teszik hogy az ügynököket csoportokba sorold feladataik alapján. <br /> Egy felhasználó több csapat tagja is lehet. Hozzárendelhetsz beszélgetést a csapathoz, ha közösen dolgoznak. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "Ebben a fiókban nincs csapat létrehozva.",
       "EDIT_TEAM": "Csapat szerkesztése"
@@ -98,7 +98,7 @@
       },
       "CONFIRM": {
         "TITLE": "Biztosan törölni akarod: %{teamName}",
-        "PLACE_HOLDER": "Please type {teamName} to confirm",
+        "PLACE_HOLDER": "Kérlek gépeld be, hogy {teamName} a megerősítéshez",
         "MESSAGE": "A csapat letörlése a hozzárendelt beszélgetéseket is eltávolítja.",
         "YES": "Törlés ",
         "NO": "Mégse"
diff --git a/app/javascript/dashboard/i18n/locale/id/advancedFilters.json b/app/javascript/dashboard/i18n/locale/id/advancedFilters.json
index cd08b0eb9..75b5d9b4a 100644
--- a/app/javascript/dashboard/i18n/locale/id/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/id/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Label",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Atribut Kustom"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Nama dibutuhkan",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Batalkan",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Konfirmasi Penghapusan",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Ya, Hapus",
+            "NO": "Tidak, Simpan"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/automation.json b/app/javascript/dashboard/i18n/locale/id/automation.json
index c3614a990..f5139cc4b 100644
--- a/app/javascript/dashboard/i18n/locale/id/automation.json
+++ b/app/javascript/dashboard/i18n/locale/id/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER": "Otomatisasi",
+    "HEADER_BTN_TXT": "Tambah aturan otomatisasi",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Tambah aturan otomatisasi",
+      "SUBMIT": "Buat",
+      "CANCEL_BUTTON_TEXT": "Batalkan",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Nama dibutuhkan"
+        },
+        "DESC": {
+          "LABEL": "Deskripsi",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Deskripsi dibutuhkan"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Aksi"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nama",
+        "Deskripsi",
+        "Aktif",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Hapus",
+      "CANCEL_BUTTON_TEXT": "Batalkan",
+      "CONFIRM": {
+        "TITLE": "Konfirmasi Penghapusan",
+        "MESSAGE": "Apakah Anda yakin untuk menghapus ",
+        "YES": "Ya, Hapus ",
+        "NO": "Tidak, Simpan "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Edit",
+      "CANCEL_BUTTON_TEXT": "Batalkan",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edit",
+      "CREATE": "Buat",
+      "DELETE": "Hapus",
+      "CANCEL": "Batalkan",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/campaign.json b/app/javascript/dashboard/i18n/locale/id/campaign.json
index 73e3d875e..be1186677 100644
--- a/app/javascript/dashboard/i18n/locale/id/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/id/campaign.json
@@ -120,7 +120,7 @@
     "ONGOING": {
       "HEADER": "Kampanye yang sedang berlangsung",
       "404": "Tidak ada kampanye yang sedang berlangsung yang dibuat",
-      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+      "INBOXES_NOT_FOUND": "Silakan buat sebuah kotak masuk sms dan mulai menambahkan kampanye"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/id/cannedMgmt.json
index 1b36b609c..f547080ca 100644
--- a/app/javascript/dashboard/i18n/locale/id/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Tambahkan Canned Response",
     "LOADING": "Mengambil Canned Responses",
     "SEARCH_404": "Tidak ada item yang cocok dengan kueri ini",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responsesadalah template balasan tersimpan yang dapat digunakan untuk mengirim balasan percakapan dengan cepat. </p><p> Untuk membuat Canned Response, cukup klik pada <b>Tambah Canned Response</b>. Anda juga dapat mengedit atau menghapus Tanggapan Kalengan yang ada dengan mengklik tombol Edit atau Hapus </p><p> Canned responses digunakan dengan bantuan <b>Short Codes</b>. Agen dapat mengakses canned response saat sedang mengobrol dengan mengetik <b>'/'</b> diikuti dengan kode singkat. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Tidak ada canned response yang tersedia di akun ini.",
       "TITLE": "Kelola canned response",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Tambahkan Canned Response",
-      "DESC": "Canned Response adalah template balasan tersimpan yang dapat digunakan untuk mengirim balasan percakapan dengan cepat.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Batalkan",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Short Code",
-          "PLACEHOLDER": "Harap masukkan shortcode",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Short Code dibutuhkan"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/id/chatlist.json b/app/javascript/dashboard/i18n/locale/id/chatlist.json
index 0ee7dca28..e846ddaa5 100644
--- a/app/javascript/dashboard/i18n/locale/id/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/id/chatlist.json
@@ -7,7 +7,7 @@
       "404": "Tidak ada percakapan aktif di grup ini."
     },
     "TAB_HEADING": "Percakapan",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "Sebutkan",
     "SEARCH": {
       "INPUT": "Telusuri Orang, Obrolan, Balasan Tersimpan.."
     },
@@ -47,10 +47,10 @@
         "TEXT": "Terselesaikan"
       },
       "pending": {
-        "TEXT": "Pending"
+        "TEXT": "Ditunda"
       },
       "snoozed": {
-        "TEXT": "Snoozed"
+        "TEXT": "Ditunda Sebentar"
       }
     },
     "ATTACHMENTS": {
@@ -76,10 +76,10 @@
     "RECEIVED_VIA_EMAIL": "Diterima melalui email",
     "VIEW_TWEET_IN_TWITTER": "Lihat tweet di Twitter",
     "REPLY_TO_TWEET": "Balas tweet ini",
-    "SENT": "Sent successfully",
+    "SENT": "Berhasil terkirim",
     "NO_MESSAGES": "Tidak Ada Pesan",
     "NO_CONTENT": "Tidak ada konten yang tersedia",
-    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "HIDE_QUOTED_TEXT": "Sembunyikan Teks yang Dikutip",
+    "SHOW_QUOTED_TEXT": "Tampilkan Tex yang Dikutip"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index 11fc88bff..a5f7864e4 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "Perusahaan",
     "LOCATION": "Lokasi",
     "CONVERSATION_TITLE": "Detail Percakapan",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "Lihat Profil",
     "BROWSER": "Browser",
     "OS": "Sistem Operasi",
     "INITIATED_FROM": "Dimulai dari",
@@ -33,8 +33,8 @@
         "NO_RESULT": "Tidak ada label"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
+    "MERGE_CONTACT": "Gabungkan Kontak",
+    "CONTACT_ACTIONS": "Tindakan Kontak",
     "MUTE_CONTACT": "Mute Percakapan",
     "UNMUTE_CONTACT": "Unmute Percakapan",
     "MUTED_SUCCESS": "Percakapan ini di mute selama 6 jam",
@@ -111,7 +111,7 @@
         "LABEL": "Nomor Telpon",
         "HELP": "Nomer telepon harus dalam format E.164 misalnya: +1415555555 [+][kode negara][kode area][nomer telepon]",
         "ERROR": "Nomer telepon harus kosong atau dalam format E. 164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "Nomer ini sudah dipakai dengan kontak lain."
       },
       "LOCATION": {
         "PLACEHOLDER": "Masukkan lokasi kontak",
@@ -157,9 +157,9 @@
         "ERROR": "Pilih kotak masuk"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "Subjek",
+        "PLACEHOLDER": "subjek",
+        "ERROR": "Subjek tidak boleh kosong"
       },
       "MESSAGE": {
         "LABEL": "Pesan",
@@ -169,6 +169,7 @@
       "SUBMIT": "Kirim pesan",
       "CANCEL": "Batalkan",
       "SUCCESS_MESSAGE": "Pesan terkirim!",
+      "GO_TO_CONVERSATION": "Lihat",
       "ERROR_MESSAGE": "Tidak dapat mengirim! coba lagi"
     }
   },
@@ -177,7 +178,9 @@
     "FIELDS": "Isian kontak",
     "SEARCH_BUTTON": "Cari",
     "SEARCH_INPUT_PLACEHOLDER": "Cari Kontak",
-    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS": "Saring",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Memuat kontak...",
       "404": "Tidak ada kontak yang cocok dengan pencarian Anda 🔍",
@@ -198,7 +201,7 @@
   },
   "CONTACT_PROFILE": {
     "BACK_BUTTON": "Kontak",
-    "LOADING": "Loading contact profile..."
+    "LOADING": "Memuat profil kontak..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
@@ -211,13 +214,13 @@
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "Mengambil catatan...",
+    "NOT_AVAILABLE": "Tidak ada catatan yang dibuat untuk kontak ini",
     "HEADER": {
       "TITLE": "Catatan"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "menambahkan catatan"
     },
     "ADD": {
       "BUTTON": "Tambah",
@@ -225,7 +228,7 @@
       "TITLE": "Shift + Enter untuk membuat sebuah catatan"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Hapus catatan"
     }
   },
   "EVENTS": {
@@ -239,13 +242,13 @@
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
+    "ADD_BUTTON_TEXT": "Tambahkan atribut",
     "BUTTON": "Tambahkan atribut kustom",
     "NOT_AVAILABLE": "Tidak ada atribut kustom yang tersedia untuk kontak ini.",
     "COPY_SUCCESSFUL": "Berhasil disalin ke clipboard",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
+      "COPY": "Salin atribut",
+      "DELETE": "Hapus atribut",
       "EDIT": "Edit atribut"
     },
     "ADD": {
@@ -265,26 +268,26 @@
         "PLACEHOLDER": "Mis: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
+        "TITLE": "Membuat atribut baru ",
         "SUCCESS": "Atribut berhasil ditambahkan",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "ERROR": "Tidak dapat membuat sebuah atribut, Silakan coba lagi nanti"
       },
       "UPDATE": {
         "SUCCESS": "Atribut berhasil diperbarui",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "ERROR": "Tidak dapat memperbaharui sebuah atribut, Silakan coba lagi nanti"
       },
       "DELETE": {
         "SUCCESS": "Atribut berhasil dihapus",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "ERROR": "Tidak dapat menghapus atribut. Silakan coba lagi nanti"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "Tambahkan atribut",
+        "PLACEHOLDER": "Cari atribut",
+        "NO_RESULT": "Tidak ditemukan atribut"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
+          "PLACEHOLDER": "Pilih nilai",
           "SEARCH_INPUT_PLACEHOLDER": "Search value",
           "NO_RESULT": "No result found"
         }
diff --git a/app/javascript/dashboard/i18n/locale/id/contactFilters.json b/app/javascript/dashboard/i18n/locale/id/contactFilters.json
index 7dab05052..009049026 100644
--- a/app/javascript/dashboard/i18n/locale/id/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/id/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nama",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Nomor Telpon",
             "IDENTIFIER": "Identifier",
             "CITY": "Kota",
-            "COUNTRY": "Negara"
+            "COUNTRY": "Negara",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Atribut Kustom"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 65aff169c..8f7ba5241 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Memuat Percakapan",
     "CANNOT_REPLY": "Anda tidak dapat membalas karena",
     "24_HOURS_WINDOW": "Pembatasan jendela pesan 24 jam",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "Anda hanya dapat membalas percakapan ini menggunakan pesan template karena",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Pembatasan jendela pesan 24 jam",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File melebihi batas {MAXIMUM_FILE_UPLOAD_SIZE} lampiran",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Dikirim oleh:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Pilih Agen",
       "REMOVE": "Hapus",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Undang anggota tim Anda",
-      "DESCRIPTION": "Saat Anda bersiap untuk berbicara dengan pelanggan Anda, bawa rekan satu tim untuk membantu Anda. Anda dapat mengundang rekan tim Anda dengan menambahkan alamat email mereka ke daftar agen.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Klik di sini untuk mengundang anggota tim"
     },
     "INBOXES": {
@@ -161,21 +166,21 @@
     "ADD_BUTTON_TEXT": "Create attribute",
     "UPDATE": {
       "SUCCESS": "Atribut berhasil diperbarui",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "ERROR": "Tidak dapat memperbaharui sebuah atribut, Silakan coba lagi nanti"
     },
     "ADD": {
       "TITLE": "Tambah",
       "SUCCESS": "Atribut berhasil ditambahkan",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "ERROR": "Tidak dapat membuat sebuah atribut, Silakan coba lagi nanti"
     },
     "DELETE": {
       "SUCCESS": "Atribut berhasil dihapus",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "ERROR": "Tidak dapat menghapus atribut. Silakan coba lagi nanti"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "Tambahkan atribut",
+      "PLACEHOLDER": "Cari atribut",
+      "NO_RESULT": "Tidak ditemukan atribut"
     }
   },
   "EMAIL_HEADER": {
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index e5d200f7a..88cb912b0 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Jumlah hari setelah tiket harus diselesaikan secara otomatis jika tidak ada aktivitas",
         "PLACEHOLDER": "30",
-        "ERROR": "Harap masukkan durasi penyelesaian otomatis yang valid (minimal 1 hari)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Kelanjutan percakapan dengan email diaktifkan untuk akun Anda.",
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index 3d8c74a47..e95b2cec1 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Aktifkan sambutan channel",
-          "HELP_TEXT": "Kirim pesan salam kepada pengguna saat dia memulai percakapan.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Diaktifkan",
           "DISABLED": "Nonaktif"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "Channel SMS melalui Twilio",
-        "DESC": "Mulai mendukung pelanggan Anda melalui SMS dengan integrasi Twilio."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Bagian ini diperlukan"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Bagian ini diperlukan"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Bagian ini diperlukan"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Bagian ini diperlukan"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nama Kotak Masuk",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Bagian ini diperlukan"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Nomor Telpon",
+            "PLACEHOLDER": "Silakan masukkan nomor telepon dari mana pesan akan dikirim.",
+            "ERROR": "Harap masukkan nomor yang valid. Nomor telepon harus dimulai dengan tanda `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "URL Callback",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Diaktifkan",
         "DISABLED": "Nonaktif"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Diaktifkan",
+        "DISABLED": "Nonaktif"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Diaktifkan",
+        "DISABLED": "Nonaktif"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Aktifkan penugasan otomatis",
       "ENABLE_CSAT": "Aktifkan CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Aktifkan/Nonaktifkan survey CSAT (Kepuasan pelanggan) setelah penyelesaian percakapan",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Pengaturan Kotak Masuk",
       "INBOX_UPDATE_SUB_TEXT": "Perbarui pengaturan kotak masuk Anda",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Mengaktifkan atau menonaktifkan penugasan otomatis percakapan baru ke agen yang ditambahkan ke kotak masuk ini.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Pengenal Kotak Masuk",
       "INBOX_IDENTIFIER_SUB_TEXT": "Gunakan token inbox_identifier` yang terlihat disini untuk mengautentikasi klien API Anda.",
       "FORWARD_EMAIL_TITLE": "Teruskan ke Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Mulailah meneruskan email Anda ke alamat email berikut."
+      "FORWARD_EMAIL_SUB_TEXT": "Mulailah meneruskan email Anda ke alamat email berikut.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Otorisasi ulang",
diff --git a/app/javascript/dashboard/i18n/locale/id/index.js b/app/javascript/dashboard/i18n/locale/id/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/id/index.js
+++ b/app/javascript/dashboard/i18n/locale/id/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 55ea4a2e3..e66ac46f8 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Silakan masukkan kata sandi saat ini"
       },
       "PASSWORD": {
-        "LABEL": "Kata Sandi",
+        "LABEL": "New password",
         "ERROR": "Silakan masukkan sandi dengan panjang 6 karakter atau lebih",
         "PLACEHOLDER": "Silakan masukkan kata sandi baru"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Konfirmasi kata sandi baru",
         "ERROR": "Konfirmasi kata sandi harus sama dengan kata sandi",
-        "PLACEHOLDER": "Harap masukkan kembali kata sandi anda"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -136,7 +136,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "Percakapan",
     "ALL_CONVERSATIONS": "Semua Percakapan",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "Sebutkan",
     "REPORTS": "Laporan",
     "SETTINGS": "Pengaturan",
     "CONTACTS": "Kontak",
@@ -151,13 +151,15 @@
     "APPLICATIONS": "Aplikasi",
     "LABELS": "Label",
     "CUSTOM_ATTRIBUTES": "Atribut Kustom",
-    "AUTOMATION": "Automation",
+    "AUTOMATION": "Otomatisasi",
     "TEAMS": "Tim",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Semua Kontak",
     "TAGGED_WITH": "Tandai dengan",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
+    "NEW_LABEL": "Label baru",
+    "NEW_TEAM": "Tim baru",
+    "NEW_INBOX": "Katak masuk baru",
     "REPORTS_OVERVIEW": "Gambaran",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Kampanye",
diff --git a/app/javascript/dashboard/i18n/locale/id/teamsSettings.json b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
index 250ca0ad4..5f89d53cd 100644
--- a/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Tim",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "Belum ada tim yang dibuat pada akun ini.",
       "EDIT_TEAM": "Edit Tim"
diff --git a/app/javascript/dashboard/i18n/locale/it/advancedFilters.json b/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
index ec3e2b7bf..5cf4d37c8 100644
--- a/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
@@ -5,7 +5,7 @@
     "ADD_NEW_FILTER": "Add Filter",
     "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
     "SUBMIT_BUTTON_LABEL": "Apply filters",
-    "CANCEL_BUTTON_LABEL": "annulla",
+    "CANCEL_BUTTON_LABEL": "Annulla",
     "CLEAR_BUTTON_LABEL": "Clear Filters",
     "EMPTY_VALUE_ERROR": "Value is required",
     "TOOLTIP_LABEL": "Filter conversations",
@@ -19,19 +19,68 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Stato",
       "ASSIGNEE_NAME": "Assignee Name",
-      "INBOX_NAME": "Nome Posta In Arrivo",
+      "INBOX_NAME": "Nome Posta in arrivo",
       "TEAM_NAME": "Team Name",
       "CONVERSATION_IDENTIFIER": "Conversation Identifier",
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Etichette",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Attributi personalizzati"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Il nome è obbligatorio",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Annulla",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Conferma eliminazione",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Sì, elimina",
+            "NO": "No, mantienilo"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/agentMgmt.json b/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
index b9fcb0fb6..1f6da77df 100644
--- a/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
@@ -1,8 +1,8 @@
 {
   "AGENT_MGMT": {
     "HEADER": "Agenti",
-    "HEADER_BTN_TXT": "Aggiungi Agente",
-    "LOADING": "Recupero elenco Operatori",
+    "HEADER_BTN_TXT": "Aggiungi agente",
+    "LOADING": "Recupero elenco agenti",
     "SIDEBAR_TXT": "<p><b>Agenti</b></p> <p> Un <b>agente</b> è membro del tuo team di assistenza clienti. </p><p> Gli agenti saranno in grado di visualizzare e rispondere ai messaggi dei tuoi utenti. L'elenco mostra tutti gli agenti attualmente presenti nel tuo account. </p><p> Clicca su <b>Aggiungi agente</b> per aggiungere un nuovo agente. Ogni agente che aggiungi riceverà un'email con un link di conferma per attivare il loro account, dopo di che possono accedere a Chatwoot e rispondere ai messaggi. </p><p> L'accesso alle funzionalità di Chatwoot si basa sui seguenti ruoli. </p><p> <b>Agente</b> - Gli agenti con questo ruolo possono accedere solo a messaggi, report e conversazioni. Possono assegnare conversazioni ad altri agenti o a se stessi e risolvere le conversazioni.</p><p> <b>Amministratore</b> - L'amministratore avrà accesso a tutte le funzionalità di Chatwoot abilitate per il tuo account, comprese le impostazioni, insieme a tutti i privilegi di un agente normale.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Amministratore",
@@ -12,43 +12,43 @@
       "404": "Non ci sono agenti associati a questo account",
       "TITLE": "Gestisci gli agenti nel tuo team",
       "DESC": "Puoi aggiungere/rimuovere agenti da/nel tuo team.",
-      "NAME": "nome",
+      "NAME": "Nome",
       "EMAIL": "EMAIL",
       "STATUS": "Stato",
-      "ACTIONS": "azioni",
+      "ACTIONS": "Azioni",
       "VERIFIED": "Verificato",
       "VERIFICATION_PENDING": "Verifica in sospeso"
     },
     "ADD": {
       "TITLE": "Aggiungi agente al tuo team",
-      "DESC": "Puoi aggiungere persone che saranno in grado di gestire il supporto per le tue caselle.",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "DESC": "Puoi aggiungere persone che saranno in grado di gestire il supporto per la tua posta in arrivo.",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "FORM": {
         "NAME": {
-          "LABEL": "Nome dell'Agente",
+          "LABEL": "Nome dell'agente",
           "PLACEHOLDER": "Inserisci un nome dell'agente"
         },
         "AGENT_TYPE": {
-          "LABEL": "Tipo Agente",
-          "PLACEHOLDER": "Seleziona un tipo",
-          "ERROR": "Tipo agente richiesto"
+          "LABEL": "Ruolo",
+          "PLACEHOLDER": "Seleziona un ruolo",
+          "ERROR": "Il ruolo è obbligatorio"
         },
         "EMAIL": {
           "LABEL": "Indirizzo email",
           "PLACEHOLDER": "Si prega di inserire un indirizzo email dell'agente"
         },
-        "SUBMIT": "Aggiungi Agente"
+        "SUBMIT": "Aggiungi agente"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Agente: aggiunto correttamente",
-        "EXIST_MESSAGE": "Agente: email già in uso, prova con un altro indirizzo email",
+        "SUCCESS_MESSAGE": "Agente aggiunto correttamente",
+        "EXIST_MESSAGE": "Email dell'agente già in uso, prova un altro indirizzo email",
         "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Cancellare",
+      "BUTTON_TEXT": "Elimina",
       "API": {
-        "SUCCESS_MESSAGE": "Agente: eliminato con successo",
+        "SUCCESS_MESSAGE": "Agente eliminato con successo",
         "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
       },
       "CONFIRM": {
@@ -62,30 +62,30 @@
       "TITLE": "Modifica agente",
       "FORM": {
         "NAME": {
-          "LABEL": "Nome dell'Agente",
+          "LABEL": "Nome dell'agente",
           "PLACEHOLDER": "Inserisci un nome dell'agente"
         },
         "AGENT_TYPE": {
-          "LABEL": "Tipo Agente",
-          "PLACEHOLDER": "Seleziona un tipo",
-          "ERROR": "Tipo agente richiesto"
+          "LABEL": "Ruolo",
+          "PLACEHOLDER": "Seleziona un ruolo",
+          "ERROR": "Il ruolo è obbligatorio"
         },
         "EMAIL": {
           "LABEL": "Indirizzo email",
           "PLACEHOLDER": "Si prega di inserire un indirizzo email dell'agente"
         },
-        "SUBMIT": "Modifica Agente"
+        "SUBMIT": "Modifica agente"
       },
       "BUTTON_TEXT": "Modifica",
       "CANCEL_BUTTON_TEXT": "annulla",
       "API": {
-        "SUCCESS_MESSAGE": "Agente: aggiornato correttamente",
+        "SUCCESS_MESSAGE": "Agente aggiornato correttamente",
         "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
       },
       "PASSWORD_RESET": {
-        "ADMIN_RESET_BUTTON": "Reimpostare la password",
+        "ADMIN_RESET_BUTTON": "Reimposta la password",
         "ADMIN_SUCCESS_MESSAGE": "Un'email con le istruzioni per reimpostare la password è stata inviata all'agente",
-        "SUCCESS_MESSAGE": "Agente: reimpostata correttamente",
+        "SUCCESS_MESSAGE": "Password dell'agente reimpostata correttamente",
         "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
index 8c13f3b4b..4e2d3ec2c 100644
--- a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
@@ -1,23 +1,23 @@
 {
   "ATTRIBUTES_MGMT": {
-    "HEADER": "Attributi Personalizzati",
+    "HEADER": "Attributi personalizzati",
     "HEADER_BTN_TXT": "Add Custom Attribute",
     "LOADING": "Fetching custom attributes",
     "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Crea",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "FORM": {
         "NAME": {
-          "LABEL": "Nome Visualizzato",
+          "LABEL": "Nome visualizzato",
           "PLACEHOLDER": "Enter custom attribute display name",
           "ERROR": "Il nome è obbligatorio"
         },
         "DESC": {
           "LABEL": "Descrizione",
           "PLACEHOLDER": "Enter custom attribute description",
-          "ERROR": "Descrizione obbligatoria"
+          "ERROR": "La descrizione è obbligatoria"
         },
         "MODEL": {
           "LABEL": "Applies to",
@@ -47,7 +47,7 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Cancellare",
+      "BUTTON_TEXT": "Elimina",
       "API": {
         "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
         "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
@@ -56,13 +56,13 @@
         "TITLE": "Sei sicuro di voler eliminare - %{attributeName}",
         "PLACE_HOLDER": "Digita {attributeName} per confermare",
         "MESSAGE": "Deleting will remove the custom attribute",
-        "YES": "Cancellare ",
-        "NO": "annulla"
+        "YES": "Elimina ",
+        "NO": "Annulla"
       }
     },
     "EDIT": {
       "TITLE": "Edit Custom Attribute",
-      "UPDATE_BUTTON_TEXT": "Aggiornamento",
+      "UPDATE_BUTTON_TEXT": "Aggiorna",
       "TYPE": {
         "LIST": {
           "LABEL": "List Values",
@@ -75,20 +75,20 @@
       }
     },
     "TABS": {
-      "HEADER": "Attributi Personalizzati",
+      "HEADER": "Attributi personalizzati",
       "CONVERSATION": "Conversazioni",
       "CONTACT": "Contatto"
     },
     "LIST": {
       "TABLE_HEADER": [
-        "nome",
+        "Nome",
         "Descrizione",
         "Tipo",
         "Chiave"
       ],
       "BUTTONS": {
         "EDIT": "Modifica",
-        "DELETE": "Cancellare"
+        "DELETE": "Elimina"
       },
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
diff --git a/app/javascript/dashboard/i18n/locale/it/automation.json b/app/javascript/dashboard/i18n/locale/it/automation.json
index c3614a990..c26adc113 100644
--- a/app/javascript/dashboard/i18n/locale/it/automation.json
+++ b/app/javascript/dashboard/i18n/locale/it/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER": "Automazione",
+    "HEADER_BTN_TXT": "Aggiungi regola di automazione",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Aggiungi regola di automazione",
+      "SUBMIT": "Crea",
+      "CANCEL_BUTTON_TEXT": "annulla",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Il nome è obbligatorio"
+        },
+        "DESC": {
+          "LABEL": "Descrizione",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "La descrizione è obbligatoria"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Azioni"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nome",
+        "Descrizione",
+        "Attivo",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Elimina",
+      "CANCEL_BUTTON_TEXT": "annulla",
+      "CONFIRM": {
+        "TITLE": "Conferma eliminazione",
+        "MESSAGE": "Sei sicuro di voler eliminare ",
+        "YES": "Sì, elimina ",
+        "NO": "No, Conserva "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Modifica",
+      "CANCEL_BUTTON_TEXT": "annulla",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Modifica",
+      "CREATE": "Crea",
+      "DELETE": "Elimina",
+      "CANCEL": "annulla",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/campaign.json b/app/javascript/dashboard/i18n/locale/it/campaign.json
index 2010f41a7..03a4be51b 100644
--- a/app/javascript/dashboard/i18n/locale/it/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/it/campaign.json
@@ -1,15 +1,15 @@
 {
   "CAMPAIGN": {
     "HEADER": "Campagne",
-    "SIDEBAR_TXT": "I messaggi proattivi consentono al cliente di inviare messaggi in uscita ai propri contatti che attiverebbero più conversazioni. Clicca su <b>Aggiungi Campagna</b> per creare una nuova campagna. È inoltre possibile modificare o eliminare una campagna esistente facendo clic sul pulsante Modifica o Elimina.",
+    "SIDEBAR_TXT": "I messaggi proattivi consentono al cliente di inviare messaggi in uscita ai propri contatti che attiverebbero più conversazioni. Clicca su <b>Aggiungi campagna</b> per creare una nuova campagna. Puoi anche modificare o eliminare una campagna esistente facendo clic sul pulsante Modifica o Elimina.",
     "HEADER_BTN_TXT": {
       "ONE_OFF": "Crea una campagna una tantum",
-      "ONGOING": "Crea una campagna in uscita"
+      "ONGOING": "Crea una campagna in corso"
     },
     "ADD": {
       "TITLE": "Crea una campagna",
       "DESC": "I messaggi proattivi consentono al cliente di inviare messaggi in uscita ai propri contatti che attiverebbero più conversazioni.",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "CREATE_BUTTON_TEXT": "Crea",
       "FORM": {
         "TITLE": {
@@ -29,8 +29,8 @@
           "ERROR": "Il pubblico è obbligatorio"
         },
         "INBOX": {
-          "LABEL": "Seleziona Posta In Arrivo",
-          "PLACEHOLDER": "Seleziona Posta In Arrivo",
+          "LABEL": "Seleziona Posta in arrivo",
+          "PLACEHOLDER": "Seleziona Posta in arrivo",
           "ERROR": "La posta in arrivo è obbligatoria"
         },
         "MESSAGE": {
@@ -41,7 +41,7 @@
         "SENT_BY": {
           "LABEL": "Inviato da",
           "PLACEHOLDER": "Seleziona il contenuto della campagna",
-          "ERROR": "Mittente è obbligatorio"
+          "ERROR": "Il mittente è obbligatorio"
         },
         "END_POINT": {
           "LABEL": "URL",
@@ -49,13 +49,13 @@
           "ERROR": "Inserisci un URL valido"
         },
         "TIME_ON_PAGE": {
-          "LABEL": "Tempo sulla pagina(Secondi)",
+          "LABEL": "Tempo sulla pagina (Secondi)",
           "PLACEHOLDER": "Inserisci l'ora",
           "ERROR": "Il tempo sulla pagina è richiesto"
         },
         "ENABLED": "Abilita campagna",
         "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
-        "SUBMIT": "Aggiungi Campagna"
+        "SUBMIT": "Aggiungi campagna"
       },
       "API": {
         "SUCCESS_MESSAGE": "Campagna creata con successo",
@@ -63,7 +63,7 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Cancellare",
+      "BUTTON_TEXT": "Elimina",
       "CONFIRM": {
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare?",
@@ -77,7 +77,7 @@
     },
     "EDIT": {
       "TITLE": "Modifica campagna",
-      "UPDATE_BUTTON_TEXT": "Aggiornamento",
+      "UPDATE_BUTTON_TEXT": "Aggiorna",
       "API": {
         "SUCCESS_MESSAGE": "Campagna aggiornata con successo",
         "ERROR_MESSAGE": "Si è verificato un errore, riprova"
@@ -89,18 +89,18 @@
       "TABLE_HEADER": {
         "TITLE": "Titolo",
         "MESSAGE": "Messaggio",
-        "INBOX": "Posta",
+        "INBOX": "Posta in arrivo",
         "STATUS": "Stato",
         "SENDER": "Mittente",
         "URL": "URL",
         "SCHEDULED_AT": "Orario previsto",
-        "TIME_ON_PAGE": "Tempo(Secondi)",
+        "TIME_ON_PAGE": "Tempo (Secondi)",
         "CREATED_AT": "Creato il"
       },
       "BUTTONS": {
         "ADD": "Aggiungi",
         "EDIT": "Modifica",
-        "DELETE": "Cancellare"
+        "DELETE": "Elimina"
       },
       "STATUS": {
         "ENABLED": "Abilitato",
diff --git a/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json
index 3f44361c0..8a3028a93 100644
--- a/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json
@@ -2,27 +2,27 @@
   "CANNED_MGMT": {
     "HEADER": "Risposte predefinite",
     "HEADER_BTN_TXT": "Aggiungi risposta predefinita",
-    "LOADING": "Recupero risposte predefinite",
+    "LOADING": "Recupero delle risposte predefinite",
     "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta",
-    "SIDEBAR_TXT": "<p><b>Risposte predefinite</b> </p><p> Le risposte predefinite sono modelli di risposta salvati che possono essere utilizzati per inviare rapidamente una risposta a una conversazione. </p><p> Per creare una risposta predefinita, basta cliccare sulla <b>Aggiungi risposta preconfezionata</b>. Puoi anche modificare o eliminare una risposta predefinita esistente cliccando sul pulsante Modifica o Elimina </p><p> risposte predefinite sono utilizzate con l'aiuto di <b>Codici Brevi</b>. Gli agenti possono accedere alle risposte predefinite durante una chat digitando <b>'/'</b> seguiti dal codice breve. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Non ci sono risposte predefinite disponibili in questo account.",
       "TITLE": "Gestisci le risposte predefinite",
       "DESC": "Le risposte predefinite sono modelli di risposta predefiniti che possono essere utilizzati per inviare rapidamente risposte ai ticket.",
       "TABLE_HEADER": [
-        "Codice Breve",
+        "Codice breve",
         "Contenuto",
-        "azioni"
+        "Azioni"
       ]
     },
     "ADD": {
       "TITLE": "Aggiungi risposta predefinita",
-      "DESC": "Le risposte predefinite sono modelli di risposta salvati che possono essere utilizzati per inviare rapidamente una risposta alla conversazione.",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Codice Breve",
-          "PLACEHOLDER": "Si prega di inserire uno shortcode",
+          "LABEL": "Codice breve",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Il codice breve è obbligatorio"
         },
         "CONTENT": {
@@ -39,11 +39,11 @@
     },
     "EDIT": {
       "TITLE": "Modifica risposta predefinita",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Codice Breve",
-          "PLACEHOLDER": "Si prega di inserire uno shortcode",
+          "LABEL": "Codice breve",
+          "PLACEHOLDER": "Si prega di inserire un codice breve",
           "ERROR": "Il codice breve è obbligatorio"
         },
         "CONTENT": {
@@ -60,16 +60,16 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Cancellare",
+      "BUTTON_TEXT": "Elimina",
       "API": {
-        "SUCCESS_MESSAGE": "Risposta preconfezionata eliminata correttamente",
+        "SUCCESS_MESSAGE": "Risposta predefinita eliminata correttamente",
         "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
       },
       "CONFIRM": {
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
         "YES": "Sì, elimina ",
-        "NO": "No, Conserva "
+        "NO": "No, conserva "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/chatlist.json b/app/javascript/dashboard/i18n/locale/it/chatlist.json
index 1ec167196..5664de4ef 100644
--- a/app/javascript/dashboard/i18n/locale/it/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/it/chatlist.json
@@ -1,6 +1,6 @@
 {
   "CHAT_LIST": {
-    "LOADING": "Recupero conversazioni",
+    "LOADING": "Recupero delle conversazioni",
     "LOAD_MORE_CONVERSATIONS": "Carica altre conversazioni",
     "EOF": "Tutte le conversazioni caricate 🎉",
     "LIST": {
@@ -14,7 +14,7 @@
     "FILTER_ALL": "Tutti",
     "STATUS_TABS": [
       {
-        "NAME": "Apri",
+        "NAME": "Aperte",
         "KEY": "contaaperture"
       },
       {
@@ -24,7 +24,7 @@
     ],
     "ASSIGNEE_TYPE_TABS": [
       {
-        "NAME": "Miniera",
+        "NAME": "Mie",
         "KEY": "Io",
         "COUNT_KEY": "contaMinore"
       },
@@ -41,13 +41,13 @@
     ],
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
-        "TEXT": "Apri"
+        "TEXT": "Aperte"
       },
       "resolved": {
         "TEXT": "Risolti"
       },
       "pending": {
-        "TEXT": "In Attesa"
+        "TEXT": "In sospeso"
       },
       "snoozed": {
         "TEXT": "Posticipato"
@@ -64,10 +64,10 @@
         "CONTENT": "Messaggio video"
       },
       "file": {
-        "CONTENT": "File Allegato"
+        "CONTENT": "File allegato"
       },
       "location": {
-        "CONTENT": "Localizzazione"
+        "CONTENT": "Posizione"
       },
       "fallback": {
         "CONTENT": "ha condiviso un url"
@@ -77,9 +77,9 @@
     "VIEW_TWEET_IN_TWITTER": "Visualizza tweet su Twitter",
     "REPLY_TO_TWEET": "Rispondi a questo tweet",
     "SENT": "Sent successfully",
-    "NO_MESSAGES": "Nessun Messaggio",
+    "NO_MESSAGES": "Nessun messaggio",
     "NO_CONTENT": "Nessun contenuto disponibile",
-    "HIDE_QUOTED_TEXT": "Nascondi Testo Citato",
-    "SHOW_QUOTED_TEXT": "Mostra Testo Citato"
+    "HIDE_QUOTED_TEXT": "Nascondi testo citato",
+    "SHOW_QUOTED_TEXT": "Mostra testo citato"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index ada85f262..93882bf8c 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -1,15 +1,15 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Non Disponibile",
+    "NOT_AVAILABLE": "Non disponibile",
     "EMAIL_ADDRESS": "Indirizzo email",
     "PHONE_NUMBER": "Numero di telefono",
     "COPY_SUCCESSFUL": "Copiato negli appunti con successo",
     "COMPANY": "Azienda",
-    "LOCATION": "Localizzazione",
+    "LOCATION": "Posizione",
     "CONVERSATION_TITLE": "Dettagli conversazione",
     "VIEW_PROFILE": "View Profile",
     "BROWSER": "Browser",
-    "OS": "Sistema Operativo",
+    "OS": "Sistema operativo",
     "INITIATED_FROM": "Iniziato da",
     "INITIATED_AT": "Iniziato alle",
     "IP_ADDRESS": "Indirizzo IP",
@@ -20,40 +20,40 @@
     },
     "LABELS": {
       "CONTACT": {
-        "TITLE": "Etichette Di Contatto",
+        "TITLE": "Etichette di contatto",
         "ERROR": "Impossibile aggiornare le etichette"
       },
       "CONVERSATION": {
-        "TITLE": "Etichette Di Conversazione",
-        "ADD_BUTTON": "Aggiungi Etichette"
+        "TITLE": "Etichette di conversazione",
+        "ADD_BUTTON": "Aggiungi etichette"
       },
       "LABEL_SELECT": {
-        "TITLE": "Aggiungi Etichette",
+        "TITLE": "Aggiungi etichette",
         "PLACEHOLDER": "Cerca etichette",
         "NO_RESULT": "Nessuna etichetta trovata"
       }
     },
     "MERGE_CONTACT": "Merge contact",
     "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "Silenzia La Conversazione",
-    "UNMUTE_CONTACT": "Riattiva La Conversazione",
+    "MUTE_CONTACT": "Silenzia conversazione",
+    "UNMUTE_CONTACT": "Riattiva conversazione",
     "MUTED_SUCCESS": "Questa conversazione è silenziata per 6 ore",
     "UNMUTED_SUCCESS": "Questa conversazione non è più silenziata",
-    "SEND_TRANSCRIPT": "Invia Trascrizione",
+    "SEND_TRANSCRIPT": "Invia trascrizione",
     "EDIT_LABEL": "Modifica",
     "SIDEBAR_SECTIONS": {
-      "CUSTOM_ATTRIBUTES": "Attributi Personalizzati",
-      "CONTACT_LABELS": "Etichette Di Contatto",
+      "CUSTOM_ATTRIBUTES": "Attributi personalizzati",
+      "CONTACT_LABELS": "Etichette di contatto",
       "PREVIOUS_CONVERSATIONS": "Conversazioni precedenti"
     }
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Modifica Contatto",
-    "TITLE": "Modifica Contatto",
+    "BUTTON_LABEL": "Modifica contatto",
+    "TITLE": "Modifica contatto",
     "DESC": "Modifica dettagli contatto"
   },
   "CREATE_CONTACT": {
-    "BUTTON_LABEL": "Nuovo Contatto",
+    "BUTTON_LABEL": "Nuovo contatto",
     "TITLE": "Crea nuovo contatto",
     "DESC": "Aggiungi informazioni di base sul contatto."
   },
@@ -65,7 +65,7 @@
     "FORM": {
       "LABEL": "CSV File",
       "SUBMIT": "Import",
-      "CANCEL": "annulla"
+      "CANCEL": "Annulla"
     },
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "Si è verificato un errore, riprova"
@@ -89,13 +89,13 @@
   "CONTACT_FORM": {
     "FORM": {
       "SUBMIT": "Invia",
-      "CANCEL": "annulla",
+      "CANCEL": "Annulla",
       "AVATAR": {
         "LABEL": "Immagine del contatto"
       },
       "NAME": {
         "PLACEHOLDER": "Inserisci il nome completo del contatto",
-        "LABEL": "Nome Completo"
+        "LABEL": "Nome completo"
       },
       "BIO": {
         "PLACEHOLDER": "Inserisci la biografia del contatto",
@@ -109,17 +109,17 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Inserisci il numero di telefono del contatto",
         "LABEL": "Numero di telefono",
-        "HELP": "Il numero di telefono dovrebbe essere di formato E.164 es.: +3915555555 [+][codice nazione][codice di zona][numero di telefono locale]",
+        "HELP": "Il numero di telefono dovrebbe essere di formato E.164 es.: +3915555555 [+][codice nazione][codice zona][numero di telefono locale]",
         "ERROR": "Il numero di telefono deve essere vuoto o di formato E.164",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
         "PLACEHOLDER": "Inserisci la posizione del contatto",
-        "LABEL": "Localizzazione"
+        "LABEL": "Posizione"
       },
       "COMPANY_NAME": {
         "PLACEHOLDER": "Inserisci il nome dell'azienda",
-        "LABEL": "Nome Azienda"
+        "LABEL": "Nome azienda"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
@@ -144,9 +144,9 @@
     "ERROR_MESSAGE": "Si è verificato un errore, riprova"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Avvia Conversazione",
+    "BUTTON_LABEL": "Avvia conversazione",
     "TITLE": "Nuova conversazione",
-    "DESC": "Avviare una nuova conversazione inviando un nuovo messaggio.",
+    "DESC": "Avvia una nuova conversazione inviando un nuovo messaggio.",
     "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
     "FORM": {
       "TO": {
@@ -167,8 +167,9 @@
         "ERROR": "Message can't be empty"
       },
       "SUBMIT": "Send message",
-      "CANCEL": "annulla",
+      "CANCEL": "Annulla",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Visualizza",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,12 +179,14 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
       "NO_CONTACTS": "There are no available contacts",
       "TABLE_HEADER": {
-        "NAME": "nome",
+        "NAME": "Nome",
         "PHONE_NUMBER": "Phone Number",
         "CONVERSATIONS": "Conversazioni",
         "LAST_ACTIVITY": "Last Activity",
diff --git a/app/javascript/dashboard/i18n/locale/it/contactFilters.json b/app/javascript/dashboard/i18n/locale/it/contactFilters.json
index c69e997c5..c174a5b7c 100644
--- a/app/javascript/dashboard/i18n/locale/it/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/it/contactFilters.json
@@ -6,7 +6,7 @@
         "CLEAR_ALL_FILTERS": "Clear All Filters",
         "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
         "SUBMIT_BUTTON_LABEL": "Invia",
-        "CANCEL_BUTTON_LABEL": "annulla",
+        "CANCEL_BUTTON_LABEL": "Annulla",
         "CLEAR_BUTTON_LABEL": "Clear Filters",
         "EMPTY_VALUE_ERROR": "Value is required",
         "TOOLTIP_LABEL": "Filter contacts",
@@ -20,15 +20,27 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
-            "NAME": "nome",
-            "EMAIL": "email",
+            "NAME": "Nome",
+            "EMAIL": "Email",
             "PHONE_NUMBER": "Numero di telefono",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Attributi personalizzati"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index c74eb4cbb..a03f5e548 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -2,11 +2,11 @@
   "CONVERSATION": {
     "404": "Si prega di selezionare una conversazione dal pannello sinistro",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
-    "NO_MESSAGE_1": "Oh oh! Sembra che non ci siano messaggi da parte dei clienti nella tua casella di posta.",
+    "NO_MESSAGE_1": "Oh oh! Sembra che non ci siano messaggi da parte dei clienti nella tua posta in arrivo.",
     "NO_MESSAGE_2": " per inviare un messaggio alla tua pagina!",
     "NO_INBOX_1": "Hola! Sembra che tu non abbia ancora aggiunto nessuna posta in arrivo.",
     "NO_INBOX_2": " per iniziare",
-    "NO_INBOX_AGENT": "Uh Oh! Sembra che tu non faccia parte di nessuna casella di posta. Per favore contatta il tuo amministratore",
+    "NO_INBOX_AGENT": "Uh Oh! Sembra che tu non faccia parte di nessuna posta in arrivo. Per favore contatta il tuo amministratore",
     "SEARCH_MESSAGES": "Search for messages in conversations",
     "SEARCH": {
       "TITLE": "Search messages",
@@ -22,12 +22,14 @@
     "LOADING_CONVERSATIONS": "Caricamento conversazioni",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
-    "DOWNLOAD": "Scaricare",
+    "DOWNLOAD": "Scarica",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
@@ -38,7 +40,7 @@
       "RESOLVE_ACTION": "Risolvi",
       "REOPEN_ACTION": "Riapri",
       "OPEN_ACTION": "Apri",
-      "OPEN": "Ulteriori",
+      "OPEN": "Altro",
       "CLOSE": "Chiudi",
       "DETAILS": "Dettagli",
       "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
@@ -55,13 +57,13 @@
       }
     },
     "FOOTER": {
-      "MSG_INPUT": "MAIUSC + INVIO per la nuova linea. Inizia con '/' per selezionare una risposta preconfezionata.",
-      "PRIVATE_MSG_INPUT": "Shift + enter per nuova linea. Questo sarà visibile solo agli agenti"
+      "MSG_INPUT": "MAIUSC + INVIO per la nuova linea. Inizia con '/' per selezionare una risposta predefinita.",
+      "PRIVATE_MSG_INPUT": "MAIUSC + INVIO per nuova linea. Questo sarà visibile solo agli agenti"
     },
     "REPLYBOX": {
-      "REPLY": "Rispondere",
-      "PRIVATE_NOTE": "Nota Privata",
-      "SEND": "Inviare",
+      "REPLY": "Rispondi",
+      "PRIVATE_NOTE": "Nota privata",
+      "SEND": "Invia",
       "CREATE": "Aggiungi nota",
       "TWEET": "Twitta",
       "TIP_FORMAT_ICON": "Show rich text editor",
@@ -85,11 +87,14 @@
     },
     "VISIBLE_TO_AGENTS": "Nota privata: visibile solo a te e al tuo team",
     "CHANGE_STATUS": "Stato conversazione cambiato",
-    "CHANGE_AGENT": "Modifica conversazione assegnatario",
+    "CHANGE_AGENT": "Modifica assegnatario conversazione",
     "CHANGE_TEAM": "Conversation team changed",
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Rimuovi",
@@ -97,14 +102,14 @@
     },
     "CONTEXT_MENU": {
       "COPY": "Copia",
-      "DELETE": "Cancellare"
+      "DELETE": "Elimina"
     }
   },
   "EMAIL_TRANSCRIPT": {
     "TITLE": "Send conversation transcript",
     "DESC": "Send a copy of the conversation transcript to the specified email address",
     "SUBMIT": "Invia",
-    "CANCEL": "annulla",
+    "CANCEL": "Annulla",
     "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
     "SEND_EMAIL_ERROR": "Si è verificato un errore, riprova",
     "FORM": {
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
@@ -151,7 +156,7 @@
     "ACCORDION": {
       "CONTACT_DETAILS": "Contact Details",
       "CONVERSATION_ACTIONS": "Conversation Actions",
-      "CONVERSATION_LABELS": "Etichette Di Conversazione",
+      "CONVERSATION_LABELS": "Etichette conversazione",
       "CONVERSATION_INFO": "Conversation Information",
       "CONTACT_ATTRIBUTES": "Contact Attributes",
       "PREVIOUS_CONVERSATION": "Conversazioni precedenti"
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index cff9cd9eb..d83f86ef6 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -1,7 +1,7 @@
 {
   "GENERAL_SETTINGS": {
-    "TITLE": "Impostazioni dell'account",
-    "SUBMIT": "Aggiorna impostazioni",
+    "TITLE": "Impostazioni account",
+    "SUBMIT": "Aggiorna le impostazioni",
     "BACK": "Back",
     "UPDATE": {
       "ERROR": "Impossibile aggiornare le impostazioni, riprova!",
@@ -18,9 +18,9 @@
         "NOTE": "This ID is required if you are building an API based integration"
       },
       "NAME": {
-        "LABEL": "Nome del conto",
+        "LABEL": "Nome account",
         "PLACEHOLDER": "Nome del tuo account",
-        "ERROR": "Inserisci un nome di conto valido"
+        "ERROR": "Inserisci un nome account valido"
       },
       "LANGUAGE": {
         "LABEL": "Lingua del sito (Beta)",
@@ -33,8 +33,8 @@
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "E-mail di supporto",
-        "PLACEHOLDER": "E-mail di supporto della tua azienda",
+        "LABEL": "Email di supporto",
+        "PLACEHOLDER": "Email di supporto della tua azienda",
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
@@ -63,7 +63,7 @@
       "LOADING_MESSAGE": "Loading notifications...",
       "404": "No Notifications",
       "TABLE_HEADER": [
-        "nome",
+        "Nome",
         "Phone Number",
         "Conversazioni",
         "Last Contacted"
@@ -97,7 +97,7 @@
       "SETTINGS": "Impostazioni"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Vai alla Dashboard di conversazione",
+      "GO_TO_CONVERSATION_DASHBOARD": "Vai alla dashboard Conversazioni",
       "GO_TO_CONTACTS_DASHBOARD": "Vai alla dashboard Contatti",
       "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
       "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
@@ -119,7 +119,7 @@
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
       "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Riaprire la conversazione",
+      "REOPEN_CONVERSATION": "Riapri la conversazione",
       "RESOLVE_CONVERSATION": "Risolvi la conversazione",
       "SEND_TRANSCRIPT": "Send an email transcript",
       "SNOOZE_CONVERSATION": "Snooze Conversation",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index d59e416a7..782a664c2 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Abilita messaggio di benvenuto sul canale",
-          "HELP_TEXT": "Invia un messaggio di saluto all'utente quando inizia la conversazione.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Abilitato",
           "DISABLED": "Disabilitato"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Questo campo è obbligatorio"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Questo campo è obbligatorio"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Questo campo è obbligatorio"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Questo campo è obbligatorio"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nome Posta In Arrivo",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Questo campo è obbligatorio"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Numero di telefono",
+            "PLACEHOLDER": "Inserisci il numero di telefono dal quale verrà inviato il messaggio.",
+            "ERROR": "Inserisci un valore valido. Il numero di telefono dovrebbe iniziare con segno `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Abilitato",
         "DISABLED": "Disabilitato"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Abilitato",
+        "DISABLED": "Disabilitato"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Abilitato",
+        "DISABLED": "Disabilitato"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Abilita assegnazione automatica",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Impostazioni della Posta In Arrivo",
       "INBOX_UPDATE_SUB_TEXT": "Aggiorna le impostazioni della posta in arrivo",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Abilita o disabilita l'assegnazione automatica di nuove conversazioni agli agenti aggiunti a questa casella di posta.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Riautorizza",
@@ -423,12 +483,12 @@
         "PLACE_HOLDER": "Port"
       },
       "EMAIL": {
-        "LABEL": "email",
-        "PLACE_HOLDER": "email"
+        "LABEL": "Email",
+        "PLACE_HOLDER": "Email"
       },
       "PASSWORD": {
-        "LABEL": "password",
-        "PLACE_HOLDER": "password"
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
       },
       "ENABLE_SSL": "Enable SSL"
     },
@@ -451,12 +511,12 @@
         "PLACE_HOLDER": "Port"
       },
       "EMAIL": {
-        "LABEL": "email",
-        "PLACE_HOLDER": "email"
+        "LABEL": "Email",
+        "PLACE_HOLDER": "Email"
       },
       "PASSWORD": {
-        "LABEL": "password",
-        "PLACE_HOLDER": "password"
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
       },
       "DOMAIN": {
         "LABEL": "Dominio",
diff --git a/app/javascript/dashboard/i18n/locale/it/index.js b/app/javascript/dashboard/i18n/locale/it/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/it/index.js
+++ b/app/javascript/dashboard/i18n/locale/it/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/it/integrationApps.json b/app/javascript/dashboard/i18n/locale/it/integrationApps.json
index b2d41283b..e39c96b67 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrationApps.json
@@ -7,7 +7,7 @@
       "ENABLED": "Abilitato",
       "DISABLED": "Disabilitato"
     },
-    "CONFIGURE": "Configurare",
+    "CONFIGURE": "Configura",
     "ADD_BUTTON": "Add a new hook",
     "DELETE": {
       "TITLE": {
@@ -22,7 +22,7 @@
         "INBOX": "Sì, elimina",
         "ACCOUNT": "Yes, Disconnect"
       },
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "API": {
         "SUCCESS_MESSAGE": "Hook deleted successfully",
         "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
@@ -32,7 +32,7 @@
       "FETCHING": "Fetching integration hooks",
       "INBOX": "Inbox",
       "DELETE": {
-        "BUTTON_TEXT": "Cancellare"
+        "BUTTON_TEXT": "Elimina"
       }
     },
     "ADD": {
@@ -42,7 +42,7 @@
           "PLACEHOLDER": "Select Inbox"
         },
         "SUBMIT": "Crea",
-        "CANCEL": "annulla"
+        "CANCEL": "Annulla"
       },
       "API": {
         "SUCCESS_MESSAGE": "Integration hook added successfully",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index 1b5e902f5..dfdf91627 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -3,24 +3,24 @@
     "HEADER": "Integrazioni",
     "WEBHOOK": {
       "TITLE": "Webhook",
-      "CONFIGURE": "Configurare",
+      "CONFIGURE": "Configura",
       "HEADER": "Impostazioni Webhook",
       "HEADER_BTN_TXT": "Aggiungi nuovo webhook",
-      "LOADING": "Recupero webhook allegati",
+      "LOADING": "Recupero dei webhooks collegati",
       "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta",
-      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>I Webhooks sono callback HTTP che possono essere definiti per ogni account. Sono innescati da eventi come la creazione di messaggi in Chatwoot. Puoi creare più di un webhook per questo account. <br /><br /> Per creare un <b>webhook</b>, clicca sul <b>Aggiungi nuovo webhook</b> pulsante. Puoi anche rimuovere qualsiasi webhook esistente cliccando sul pulsante Elimina.</p>",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>I Webhooks sono callback HTTP che possono essere definiti per ogni account. Sono innescati da eventi come la creazione di messaggi in Chatwoot. Puoi creare più di un webhook per questo account. <br /><br /> Per creare un <b>webhook</b>, clicca sul pulsante <b>Aggiungi nuovo webhook</b>. Puoi anche rimuovere qualsiasi webhook esistente cliccando sul pulsante Elimina.</p>",
       "LIST": {
         "404": "Non ci sono webhook configurati per questo account.",
         "TITLE": "Gestisci webhook",
         "TABLE_HEADER": [
           "Endpoint Webhook",
-          "azioni"
+          "Azioni"
         ]
       },
       "EDIT": {
         "BUTTON_TEXT": "Modifica",
         "TITLE": "Edit webhook",
-        "CANCEL": "annulla",
+        "CANCEL": "Annulla",
         "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
         "FORM": {
           "END_POINT": {
@@ -36,7 +36,7 @@
         }
       },
       "ADD": {
-        "CANCEL": "annulla",
+        "CANCEL": "Annulla",
         "TITLE": "Aggiungi nuovo webhook",
         "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
         "FORM": {
@@ -53,7 +53,7 @@
         }
       },
       "DELETE": {
-        "BUTTON_TEXT": "Cancellare",
+        "BUTTON_TEXT": "Elimina",
         "API": {
           "SUCCESS_MESSAGE": "Webhook eliminato con successo",
           "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
@@ -62,7 +62,7 @@
           "TITLE": "Conferma eliminazione",
           "MESSAGE": "Sei sicuro di voler eliminare ",
           "YES": "Sì, elimina ",
-          "NO": "No, Conserva"
+          "NO": "No, conserva"
         }
       }
     },
@@ -73,7 +73,7 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Cancellare",
+      "BUTTON_TEXT": "Elimina",
       "API": {
         "SUCCESS_MESSAGE": "Integration deleted successfully"
       }
diff --git a/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
index 7c5730c4b..aae980146 100644
--- a/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
@@ -1,31 +1,31 @@
 {
   "LABEL_MGMT": {
     "HEADER": "Etichette",
-    "HEADER_BTN_TXT": "Aggiungi Etichette",
+    "HEADER_BTN_TXT": "Aggiungi etichetta",
     "LOADING": "Recupero etichette",
     "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta",
-    "SIDEBAR_TXT": "<p><b>Etichette</b> <p>Le etichette ti aiutano a categorizzare le conversazioni e a darle la priorità. È possibile assegnare l'etichetta a una conversazione dal pannello laterale. <br /><br />Le etichette sono legate all'account e possono essere utilizzate per creare flussi di lavoro personalizzati nell'organizzazione. È possibile assegnare un colore personalizzato a un'etichetta, rende più facile identificare l'etichetta. Potrai visualizzare l'etichetta sulla barra laterale per filtrare facilmente le conversazioni.</p>",
+    "SIDEBAR_TXT": "<p><b>Etichette</b> <p>Le etichette ti aiutano a categorizzare le conversazioni e a dargli una priorità. È possibile assegnare l'etichetta a una conversazione dal pannello laterale. <br /><br />Le etichette sono legate all'account e possono essere utilizzate per creare flussi di lavoro personalizzati nell'organizzazione. È possibile assegnare un colore personalizzato a un'etichetta, così da rendere più facile identificare l'etichetta. Potrai visualizzare l'etichetta sulla barra laterale per filtrare facilmente le conversazioni.</p>",
     "LIST": {
       "404": "Non ci sono etichette disponibili in questo account.",
       "TITLE": "Gestisci etichette",
       "DESC": "Le etichette consentono di raggruppare le conversazioni insieme.",
       "TABLE_HEADER": [
-        "nome",
+        "Nome",
         "Descrizione",
         "Colore"
       ]
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Nome Etichetta",
-        "PLACEHOLDER": "Nome Etichetta",
+        "LABEL": "Nome etichetta",
+        "PLACEHOLDER": "Nome etichetta",
         "REQUIRED_ERROR": "Nome etichetta obbligatorio",
-        "MINIMUM_LENGTH_ERROR": "È richiesta la lunghezza minima 2",
+        "MINIMUM_LENGTH_ERROR": "È richiesta una lunghezza minima di 2",
         "VALID_ERROR": "Sono ammessi solo lettere, numeri, trattino e sottolineatura"
       },
       "DESCRIPTION": {
         "LABEL": "Descrizione",
-        "PLACEHOLDER": "Descrizione Etichetta"
+        "PLACEHOLDER": "Descrizione etichetta"
       },
       "COLOR": {
         "LABEL": "Colore"
@@ -35,11 +35,11 @@
       },
       "EDIT": "Modifica",
       "CREATE": "Crea",
-      "DELETE": "Cancellare",
-      "CANCEL": "annulla"
+      "DELETE": "Elimina",
+      "CANCEL": "Annulla"
     },
     "ADD": {
-      "TITLE": "Aggiungi Etichette",
+      "TITLE": "Aggiungi etichetta",
       "DESC": "Le etichette consentono di raggruppare le conversazioni insieme.",
       "API": {
         "SUCCESS_MESSAGE": "Etichetta aggiunta correttamente",
@@ -54,7 +54,7 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Cancellare",
+      "BUTTON_TEXT": "Elimina",
       "API": {
         "SUCCESS_MESSAGE": "Etichetta eliminata con successo",
         "ERROR_MESSAGE": "Si è verificato un errore, riprova"
@@ -63,7 +63,7 @@
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
         "YES": "Sì, elimina ",
-        "NO": "No, Conserva "
+        "NO": "No, conserva "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/login.json b/app/javascript/dashboard/i18n/locale/it/login.json
index 46fb0e367..441259382 100644
--- a/app/javascript/dashboard/i18n/locale/it/login.json
+++ b/app/javascript/dashboard/i18n/locale/it/login.json
@@ -2,12 +2,12 @@
   "LOGIN": {
     "TITLE": "Accedi a Chatwoot",
     "EMAIL": {
-      "LABEL": "email",
-      "PLACEHOLDER": "E-mail es.: qualcuno@esempio.com"
+      "LABEL": "Email",
+      "PLACEHOLDER": "Email es.: qualcuno@esempio.com"
     },
     "PASSWORD": {
-      "LABEL": "password",
-      "PLACEHOLDER": "password"
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password"
     },
     "API": {
       "SUCCESS_MESSAGE": "Accesso riuscito",
diff --git a/app/javascript/dashboard/i18n/locale/it/report.json b/app/javascript/dashboard/i18n/locale/it/report.json
index 16cfcc169..e0d54589f 100644
--- a/app/javascript/dashboard/i18n/locale/it/report.json
+++ b/app/javascript/dashboard/i18n/locale/it/report.json
@@ -1,33 +1,33 @@
 {
   "REPORT": {
     "HEADER": "Panoramica",
-    "LOADING_CHART": "Caricamento dati grafici...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza dati per generare la segnalazione, riprova più tardi.",
+    "LOADING_CHART": "Caricamento dati del grafico...",
+    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
     "DOWNLOAD_AGENT_REPORTS": "Scarica rapporti agente",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Messaggi in arrivo",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Messaggi in uscita",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
         "DESC": "( Media )"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Risoluzione Tempo",
+        "NAME": "Tempo di risoluzione",
         "DESC": "( Media )"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       }
     },
     "DATE_RANGE": [
@@ -63,34 +63,34 @@
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
-    "LOADING_CHART": "Caricamento dati grafici...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza dati per generare la segnalazione, riprova più tardi.",
+    "LOADING_CHART": "Caricamento dati del grafico...",
+    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
     "DOWNLOAD_AGENT_REPORTS": "Scarica rapporti agente",
     "FILTER_DROPDOWN_LABEL": "Select Agent",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Messaggi in arrivo",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Messaggi in uscita",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
         "DESC": "( Media )"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Risoluzione Tempo",
+        "NAME": "Tempo di risoluzione",
         "DESC": "( Media )"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       }
     },
     "DATE_RANGE": [
@@ -126,34 +126,34 @@
   },
   "LABEL_REPORTS": {
     "HEADER": "Labels Overview",
-    "LOADING_CHART": "Caricamento dati grafici...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza dati per generare la segnalazione, riprova più tardi.",
+    "LOADING_CHART": "Caricamento dati del grafico...",
+    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
     "DOWNLOAD_LABEL_REPORTS": "Download label reports",
     "FILTER_DROPDOWN_LABEL": "Select Label",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Messaggi in arrivo",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Messaggi in uscita",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
         "DESC": "( Media )"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Risoluzione Tempo",
+        "NAME": "Tempo di risoluzione",
         "DESC": "( Media )"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       }
     },
     "DATE_RANGE": [
@@ -189,34 +189,34 @@
   },
   "INBOX_REPORTS": {
     "HEADER": "Inbox Overview",
-    "LOADING_CHART": "Caricamento dati grafici...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza dati per generare la segnalazione, riprova più tardi.",
+    "LOADING_CHART": "Caricamento dati del grafico...",
+    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
     "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
-    "FILTER_DROPDOWN_LABEL": "Seleziona Posta In Arrivo",
+    "FILTER_DROPDOWN_LABEL": "Seleziona Posta in arrivo",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Messaggi in arrivo",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Messaggi in uscita",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
         "DESC": "( Media )"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Risoluzione Tempo",
+        "NAME": "Tempo di risoluzione",
         "DESC": "( Media )"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       }
     },
     "DATE_RANGE": [
@@ -252,34 +252,34 @@
   },
   "TEAM_REPORTS": {
     "HEADER": "Team Overview",
-    "LOADING_CHART": "Caricamento dati grafici...",
-    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza dati per generare la segnalazione, riprova più tardi.",
+    "LOADING_CHART": "Caricamento dati del grafico...",
+    "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
     "DOWNLOAD_TEAM_REPORTS": "Download team reports",
     "FILTER_DROPDOWN_LABEL": "Select Team",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversazioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Messaggi in arrivo",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Messaggi in uscita",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
         "DESC": "( Media )"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Risoluzione Tempo",
+        "NAME": "Tempo di risoluzione",
         "DESC": "( Media )"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
-        "DESC": "(Totale )"
+        "DESC": "( Totale )"
       }
     },
     "DATE_RANGE": [
diff --git a/app/javascript/dashboard/i18n/locale/it/resetPassword.json b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
index 071d4c1a2..fadbcc482 100644
--- a/app/javascript/dashboard/i18n/locale/it/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
@@ -1,8 +1,8 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reimpostare la password",
+    "TITLE": "Reimposta la password",
     "EMAIL": {
-      "LABEL": "email",
+      "LABEL": "Email",
       "PLACEHOLDER": "Inserisci la tua email",
       "ERROR": "Inserisci un indirizzo email valido"
     },
diff --git a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
index 87f864af8..79fe453b5 100644
--- a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
@@ -1,14 +1,14 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Imposta nuova password",
+    "TITLE": "Imposta una nuova password",
     "PASSWORD": {
-      "LABEL": "password",
-      "PLACEHOLDER": "password",
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
       "ERROR": "Password troppo corta"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Conferma Password",
-      "PLACEHOLDER": "Conferma Password",
+      "LABEL": "Conferma password",
+      "PLACEHOLDER": "Conferma password",
       "ERROR": "Le password non corrispondono"
     },
     "API": {
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index e8b7a9bd7..a9135ac4f 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -2,13 +2,13 @@
   "PROFILE_SETTINGS": {
     "LINK": "Impostazioni profilo",
     "TITLE": "Impostazioni profilo",
-    "BTN_TEXT": "Aggiorna Profilo",
+    "BTN_TEXT": "Aggiorna profilo",
     "DELETE_AVATAR": "Delete Avatar",
     "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
     "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
     "UPDATE_SUCCESS": "Il tuo profilo è stato aggiornato con successo",
     "PASSWORD_UPDATE_SUCCESS": "La tua password è stata modificata con successo",
-    "AFTER_EMAIL_CHANGED": "Il tuo profilo è stato aggiornato correttamente, effettua nuovamente il login quando le tue credenziali di accesso sono state modificate",
+    "AFTER_EMAIL_CHANGED": "Il tuo profilo è stato aggiornato correttamente, effettua nuovamente l'accesso, siccome le tue credenziali di accesso sono state modificate",
     "FORM": {
       "AVATAR": "Immagine del profilo",
       "ERROR": "Correggi gli errori del modulo",
@@ -20,8 +20,8 @@
         "NOTE": "Il tuo indirizzo email è la tua identità e viene utilizzato per l'accesso."
       },
       "PASSWORD_SECTION": {
-        "TITLE": "password",
-        "NOTE": "Aggiornare la tua password reimposterà i tuoi login in più dispositivi.",
+        "TITLE": "Password",
+        "NOTE": "Aggiornare la tua password reimposterà i tuoi accessi in più dispositivi.",
         "BTN_TEXT": "Cambia password"
       },
       "ACCESS_TOKEN": {
@@ -29,26 +29,26 @@
         "NOTE": "Questo token può essere usato se stai costruendo un'integrazione basata su API"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Notifiche Audio",
+        "TITLE": "Notifiche audio",
         "NOTE": "Abilita le notifiche audio nella dashboard per nuovi messaggi e conversazioni.",
         "NONE": "Nessuno",
-        "ASSIGNED": "Conversazioni Assegnate",
-        "ALL_CONVERSATIONS": "Tutte Le Conversazioni"
+        "ASSIGNED": "Conversazioni assegnate",
+        "ALL_CONVERSATIONS": "Tutte le conversazioni"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Notifiche email",
         "NOTE": "Aggiorna qui le tue preferenze di notifica email",
-        "CONVERSATION_ASSIGNMENT": "Invia notifiche via email quando viene assegnata una conversazione a me",
-        "CONVERSATION_CREATION": "Invia notifiche via email quando viene creata una nuova conversazione",
+        "CONVERSATION_ASSIGNMENT": "Invia notifiche email quando viene assegnata una conversazione a me",
+        "CONVERSATION_CREATION": "Invia notifiche email quando viene creata una nuova conversazione",
         "CONVERSATION_MENTION": "Invia notifiche email quando sei menzionato in una conversazione",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Invia notifiche via e-mail quando viene creato un nuovo messaggio in una conversazione assegnata"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Invia notifiche email quando viene creato un nuovo messaggio in una conversazione assegnata"
       },
       "API": {
         "UPDATE_SUCCESS": "Le preferenze per le notifiche sono state aggiornate con successo",
         "UPDATE_ERROR": "C'è stato un errore durante l'aggiornamento delle preferenze, si prega di riprovare"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Notifiche Push",
+        "TITLE": "Notifiche push",
         "NOTE": "Aggiorna qui le tue preferenze di notifiche push",
         "CONVERSATION_ASSIGNMENT": "Invia notifiche push quando una conversazione mi viene assegnata",
         "CONVERSATION_CREATION": "Invia notifiche push quando una conversazione mi viene assegnata",
@@ -66,7 +66,7 @@
         "PLACEHOLDER": "Per favore inserisci il nome completo"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Nome Visualizzato",
+        "LABEL": "Nome visualizzato",
         "ERROR": "Inserisci un nome di visualizzazione valido",
         "PLACEHOLDER": "Inserisci un nome di visualizzazione, questo verrà visualizzato nelle conversazioni"
       },
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Inserisci la password attuale"
       },
       "PASSWORD": {
-        "LABEL": "password",
+        "LABEL": "New password",
         "ERROR": "Inserisci una password di lunghezza 6 o più",
         "PLACEHOLDER": "Inserisci una nuova password"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Conferma nuova password",
         "ERROR": "La password di conferma deve corrispondere alla password",
-        "PLACEHOLDER": "Inserisci nuovamente la tua password"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -135,7 +135,7 @@
   },
   "SIDEBAR": {
     "CONVERSATIONS": "Conversazioni",
-    "ALL_CONVERSATIONS": "Tutte Le Conversazioni",
+    "ALL_CONVERSATIONS": "Tutte le conversazioni",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "REPORTS": "Segnalazioni",
     "SETTINGS": "Impostazioni",
@@ -150,9 +150,11 @@
     "ACCOUNT_SETTINGS": "Impostazioni Account",
     "APPLICATIONS": "Applicazioni",
     "LABELS": "Etichette",
-    "CUSTOM_ATTRIBUTES": "Attributi Personalizzati",
-    "AUTOMATION": "Automation",
+    "CUSTOM_ATTRIBUTES": "Attributi personalizzati",
+    "AUTOMATION": "Automazione",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Tutti I Contatti",
     "TAGGED_WITH": "Etichettato con",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/it/signup.json b/app/javascript/dashboard/i18n/locale/it/signup.json
index 0d8a0bc90..5ea4e06db 100644
--- a/app/javascript/dashboard/i18n/locale/it/signup.json
+++ b/app/javascript/dashboard/i18n/locale/it/signup.json
@@ -1,15 +1,15 @@
 {
   "REGISTER": {
     "TRY_WOOT": "Registra un account",
-    "TITLE": "Registrazione",
-    "TERMS_ACCEPT": "Registrandoti, accetti la nostra <a href=\"https://www.chatwoot.com/terms\">T & C</a> e <a href=\"https://www.chatwoot.com/privacy-policy\">informativa sulla privacy</a>",
+    "TITLE": "Registrati",
+    "TERMS_ACCEPT": "Registrandoti, accetti i nostri <a href=\"https://www.chatwoot.com/terms\">T & C</a> e l'<a href=\"https://www.chatwoot.com/privacy-policy\">informativa sulla privacy</a>",
     "ACCOUNT_NAME": {
-      "LABEL": "Nome del conto",
+      "LABEL": "Nome dell'account",
       "PLACEHOLDER": "Inserisci il nome dell'account, es.: Wayne Enterprises",
       "ERROR": "Nome account troppo corto"
     },
     "FULL_NAME": {
-      "LABEL": "Nome Completo",
+      "LABEL": "Nome completo",
       "PLACEHOLDER": "Inserisci il tuo nome completo, es.: Bruce Wayne",
       "ERROR": "Nome account troppo corto"
     },
@@ -19,13 +19,13 @@
       "ERROR": "Indirizzo email non valido"
     },
     "PASSWORD": {
-      "LABEL": "password",
-      "PLACEHOLDER": "password",
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
       "ERROR": "Password troppo corta"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Conferma Password",
-      "PLACEHOLDER": "Conferma Password",
+      "LABEL": "Conferma password",
+      "PLACEHOLDER": "Conferma password",
       "ERROR": "La password non corrisponde"
     },
     "API": {
diff --git a/app/javascript/dashboard/i18n/locale/it/teamsSettings.json b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
index c843cd680..3d7804adc 100644
--- a/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Crea un nuovo team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams ti permette di organizzare i tuoi agenti in gruppi in base alle loro responsabilità. <br /> Un utente può far parte di più team. È possibile assegnare conversazioni a un team quando si lavora in collaborazione. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "Non ci sono team creati su questo account.",
       "EDIT_TEAM": "Modifica team"
@@ -24,7 +24,7 @@
           "body": "Crea un nuovo team di agenti."
         },
         {
-          "title": "Aggiungi Agenti",
+          "title": "Aggiungi agenti",
           "route": "settings_teams_add_agents",
           "body": "Aggiungi agenti al team."
         },
@@ -53,7 +53,7 @@
           "body": "Cambia nome, descrizione e altri dettagli."
         },
         {
-          "title": "Modifica Agenti",
+          "title": "Modifica agenti",
           "route": "settings_teams_edit_members",
           "body": "Modifica agenti nel tuo team."
         },
@@ -65,13 +65,13 @@
       ]
     },
     "TEAM_FORM": {
-      "ERROR_MESSAGE": "Impossibile salvare i dettagli della squadra. Riprova."
+      "ERROR_MESSAGE": "Impossibile salvare i dettagli del team. Riprova."
     },
     "AGENTS": {
       "AGENT": "AGENTE",
       "EMAIL": "EMAIL",
       "BUTTON_TEXT": "Aggiungi agenti",
-      "ADD_AGENTS": "Aggiunta di agenti al tuo Team...",
+      "ADD_AGENTS": "Aggiunta di agenti al tuo team...",
       "SELECT": "seleziona",
       "SELECT_ALL": "seleziona tutti gli agenti",
       "SELECTED_COUNT": "%{selected} su %{total} agenti selezionati."
@@ -91,7 +91,7 @@
       "BUTTON_TEXT": "Termina"
     },
     "DELETE": {
-      "BUTTON_TEXT": "Cancellare",
+      "BUTTON_TEXT": "Elimina",
       "API": {
         "SUCCESS_MESSAGE": "Team eliminato con successo.",
         "ERROR_MESSAGE": "Impossibile eliminare il team. Riprova."
@@ -100,8 +100,8 @@
         "TITLE": "Sei sicuro di voler eliminare - %{teamName}",
         "PLACE_HOLDER": "Digita {teamName} per confermare",
         "MESSAGE": "L'eliminazione del team rimuoverà l'assegnazione del team dalle conversazioni assegnate a questo team.",
-        "YES": "Cancellare ",
-        "NO": "annulla"
+        "YES": "Elimina ",
+        "NO": "Annulla"
       }
     },
     "SETTINGS": "Impostazioni",
@@ -110,14 +110,14 @@
       "CREATE": "Crea un nuovo team",
       "NAME": {
         "LABEL": "Nome del team",
-        "PLACEHOLDER": "Esempio: Vendite, Assistenza Clienti"
+        "PLACEHOLDER": "Esempio: Vendite, Assistenza clienti"
       },
       "DESCRIPTION": {
-        "LABEL": "Descrizione Team",
+        "LABEL": "Descrizione team",
         "PLACEHOLDER": "Breve descrizione di questo team."
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Consenti l'assegnazione automatica per questa squadra."
+        "LABEL": "Consenti l'assegnazione automatica per questo team."
       },
       "SUBMIT_CREATE": "Crea un nuovo team"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
index 6d0d1cd5d..3ae6d439e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "状況",
@@ -31,7 +33,54 @@
       "LABELS": "ラベル",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "カスタム属性"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "キャンセル",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "削除の確認",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "削除する",
+            "NO": "いいえ、保存しておきます"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/automation.json b/app/javascript/dashboard/i18n/locale/ja/automation.json
index c3614a990..a46a819b7 100644
--- a/app/javascript/dashboard/i18n/locale/ja/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "作成",
+      "CANCEL_BUTTON_TEXT": "キャンセル",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "説明",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "操作"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "名前",
+        "説明",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "削除",
+      "CANCEL_BUTTON_TEXT": "キャンセル",
+      "CONFIRM": {
+        "TITLE": "削除の確認",
+        "MESSAGE": "削除してもよろしいですか？ ",
+        "YES": "削除する ",
+        "NO": "いいえ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "編集",
+      "CANCEL_BUTTON_TEXT": "キャンセル",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "編集",
+      "CREATE": "作成",
+      "DELETE": "削除",
+      "CANCEL": "キャンセル",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
index f98712139..3a57621a5 100644
--- a/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "定型文を追加",
     "LOADING": "定型文を読み込んでいます",
     "SEARCH_404": "検索内容（クエリ）に一致する項目はありませんでした",
-    "SIDEBAR_TXT": "<p><b>定型返信文</b> </p><p> 定型返信文は、あらかじめ保存されたテンプレートを利用することで、会話に対して迅速に回答するための機能です。 </p><p> 定型文を作成するには <b>定型返信文を追加</b>をクリックしてください。また、編集や削除ボタンを押すことで、定型返信文を編集したり削除したりすることもできます。 </p><p> 定型返信文は、 <b>ショートコード</b>を利用しています。担当者は、チャットのタイピング中に、半角の <b>'/'</b> を押すことで定型返信文をショートコードといっしょに利用できます。 </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "このアカウントには、利用可能な定型文の回答はありません",
       "TITLE": "定型文回答を管理する",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "定型文を追加",
-      "DESC": "定型文回答は、事前に設定した文章をテンプレートとし、会話に対して迅速に返信するためのものです。",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "キャンセル",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "ショートコード",
-          "PLACEHOLDER": "ショートコードを入力してください。",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "ショートコードは必須です"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index d371b1ec5..6f98301fb 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "キャンセル",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "表示",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ja/contactFilters.json b/app/javascript/dashboard/i18n/locale/ja/contactFilters.json
index 771cbba67..67e692d9c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "名前",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "電話番号",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "カスタム属性"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 343628281..304664010 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "会話データを読み込んでいます",
     "CANNOT_REPLY": "以下の理由で返信できません：",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "添付ファイルサイズの上限 {MAXIMUM_FILE_UPLOAD_SIZE} を超えています",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "削除",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index b659a0d41..605512458 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "チャンネルグリーティングを有効にする",
-          "HELP_TEXT": "会話を開始したときに、ユーザーに挨拶メッセージを送信します。",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "有効です",
           "DISABLED": "無効です"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "このフィールドは必須項目です"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "このフィールドは必須項目です"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "このフィールドは必須項目です"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "このフィールドは必須項目です"
+          },
+          "INBOX_NAME": {
+            "LABEL": "受信トレイ名",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "このフィールドは必須項目です"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "電話番号",
+            "PLACEHOLDER": "送信先の電話番号を入力してください。",
+            "ERROR": "正しい値を入力してください。電話番号は `+` 記号で始める必要があります。"
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "コールバック URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "有効です",
         "DISABLED": "無効です"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "有効です",
+        "DISABLED": "無効です"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "有効です",
+        "DISABLED": "無効です"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "自動割り当てを有効にする",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "受信トレイの設定",
       "INBOX_UPDATE_SUB_TEXT": "受信トレイの設定を更新する",
       "AUTO_ASSIGNMENT_SUB_TEXT": "この受信トレイに追加された担当者への新しい会話の自動割り当てを有効または無効にします。",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "以下のメールアドレスにメールを転送します。"
+      "FORWARD_EMAIL_SUB_TEXT": "以下のメールアドレスにメールを転送します。",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "再認証",
diff --git a/app/javascript/dashboard/i18n/locale/ja/index.js b/app/javascript/dashboard/i18n/locale/ja/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ja/index.js
+++ b/app/javascript/dashboard/i18n/locale/ja/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index e5d89d92e..effbe6f46 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "パスワード",
+        "LABEL": "New password",
         "ERROR": "6文字以上のパスワードを入力してください",
         "PLACEHOLDER": "新しいパスワードを入力してください"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "パスワードの確認",
         "ERROR": "パスワードは一致している必要があります",
-        "PLACEHOLDER": "パスワードを再入力してください"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "カスタム属性",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
index 33ff2487d..5ad65ce5c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json
index be1120e53..8e3f91f57 100644
--- a/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "상태",
@@ -31,7 +33,54 @@
       "LABELS": "라벨",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "사용자 지정 특성"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "취소",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "삭제 확인",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Yes, Delete",
+            "NO": "아니요, 유지합니다."
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/automation.json b/app/javascript/dashboard/i18n/locale/ko/automation.json
index c3614a990..396219547 100644
--- a/app/javascript/dashboard/i18n/locale/ko/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "만들기",
+      "CANCEL_BUTTON_TEXT": "취소",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "내용",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "액션"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "이름",
+        "내용",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "삭제",
+      "CANCEL_BUTTON_TEXT": "취소",
+      "CONFIRM": {
+        "TITLE": "삭제 확인",
+        "MESSAGE": "삭제하시겠습니까? ",
+        "YES": "예, 삭제합니다. ",
+        "NO": "아니요, 유지해주세요. "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "수정",
+      "CANCEL_BUTTON_TEXT": "취소",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "수정",
+      "CREATE": "만들기",
+      "DELETE": "삭제",
+      "CANCEL": "취소",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ko/cannedMgmt.json
index 9f34854cb..6144e787d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "미리 준비된 답변 추가",
     "LOADING": "미리 준비된 답변 가져오기",
     "SEARCH_404": "이 쿼리와 일치하는 항목이 없음",
-    "SIDEBAR_TXT": "<p><b>미리 준비된 답변</b></p><p>미리 준비된 답변은 신속하게 답변할 수 있는 저장된 답변 템플릿입니다.</p>\n<p>미리 준비된 답변을 만들기 위해 <b>[미리 준비된 답변 추가]</b>를 클릭하면 됩니다. 편집 또는 삭제 버튼을 클릭하여 미리 준비된 답변을 편집하거나 삭제할 수 있습니다.</p><p>미리 준비된 답변은 <b>단축 코드</b>의 도움으로 사용됩니다. 에이전트는 '/'를 입력 한 다음 짧은 코드를 입력하여 채팅에서 미리 준비된 답변에 액세스 할 수 있습니다.</p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "이 계정에는 미리 준비된 답변이 없습니다.",
       "TITLE": "미리 준비된 답변 관리",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "미리 준비된 답변 추가",
-      "DESC": "미리 준비된 답변은 티켓에 대한 답변을 빠르게 보내는 데 사용할 수있는 미리 정의된 답변 템플릿입니다 .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "취소",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "단축 코드",
-          "PLACEHOLDER": "단축 코드를 입력하십시오.",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "단축 코드가 필요함"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 20bc7cd62..9f2922e0b 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "취소",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "보기",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "검색",
     "SEARCH_INPUT_PLACEHOLDER": "연락처 검색",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "연락처를 불러오는 중...",
       "404": "검색과 일치하는 연락처 없음 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ko/contactFilters.json b/app/javascript/dashboard/i18n/locale/ko/contactFilters.json
index ac19c837d..c99e263f1 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "이름",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "휴대폰 번호",
             "IDENTIFIER": "Identifier",
             "CITY": "도시",
-            "COUNTRY": "국가"
+            "COUNTRY": "국가",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "사용자 지정 특성"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index 89cb6dc9b..30f083897 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "대화 불러오는 중",
     "CANNOT_REPLY": "당신은 답장을 할 수 없습니다",
     "24_HOURS_WINDOW": "24시간 메시지 창 제한",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24시간 메시지 창 제한",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "첨부파일이 최대 {MAXIMUM_FILE_UPLOAD_SIZE} 용량 제한을 넘어섭니다.",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "보낸 사람:",
+    "BOT": "봇",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "에이전트 선택",
       "REMOVE": "제거",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "팀 구성원들을 초대하세요.",
-      "DESCRIPTION": "드디어 고객과 대화할 준비가 되었습니다. 팀원들을 초대하세요. 팀원들의 이메일 주소를 에이전트 목록에 추가함으로써 초대할 수 있습니다.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "클릭하여 팀원을 초대하세요."
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 3870387a9..4f1d83809 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "활동이 없는 경우 티켓이 자동으로 해결되는 일 수",
         "PLACEHOLDER": "30",
-        "ERROR": "올바른 자동 확인 기간을 입력하십시오. (최소 1일)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "계정에 대해 이메일을 통한 대화 연속성이 활성화되었습니다.",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index a23619eb4..802cdacb1 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "채널 인사말 사용",
-          "HELP_TEXT": "대화를 시작할 때 사용자에게 인사말을 보내십시오.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "사용함",
           "DISABLED": "사용 안 함"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "해당 입력란은 필수 입력 사항입니다."
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "해당 입력란은 필수 입력 사항입니다."
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "해당 입력란은 필수 입력 사항입니다."
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "해당 입력란은 필수 입력 사항입니다."
+          },
+          "INBOX_NAME": {
+            "LABEL": "받은 메시지함 이름",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "해당 입력란은 필수 입력 사항입니다."
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "휴대폰 번호",
+            "PLACEHOLDER": "메시지를 보낼 전화 번호를 입력하십시오.",
+            "ERROR": "올바른 값을 입력하십시오. 전화번호는 + 기호로 시작해야 한다."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "콜백 URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "사용함",
         "DISABLED": "사용 안 함"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "사용함",
+        "DISABLED": "사용 안 함"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "사용함",
+        "DISABLED": "사용 안 함"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "자동 할당 사용",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "받은 메시지함 설정",
       "INBOX_UPDATE_SUB_TEXT": "받은 메시지함 설정 업데이트",
       "AUTO_ASSIGNMENT_SUB_TEXT": "받은 메시지에 추가된 에이전트에 새 대화를 자동으로 할당하거나 할당하지 않도록 설정하십시오.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "당신의 이메일 주소로 이메일 전달을 시작하십시오."
+      "FORWARD_EMAIL_SUB_TEXT": "당신의 이메일 주소로 이메일 전달을 시작하십시오.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "재승인",
diff --git a/app/javascript/dashboard/i18n/locale/ko/index.js b/app/javascript/dashboard/i18n/locale/ko/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ko/index.js
+++ b/app/javascript/dashboard/i18n/locale/ko/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 664b846d0..2e255cc37 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "비밀번호",
+        "LABEL": "New password",
         "ERROR": "6글자 이상의 비밀번호를 입력하십시오.",
         "PLACEHOLDER": "새 비밀번호를 입력하십시오."
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "새 비밀번호 확인",
         "ERROR": "비밀번호가 비밀번호와 일치하는지 확인",
-        "PLACEHOLDER": "비밀번호를 다시 입력하십시오."
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "사용자 지정 특성",
     "AUTOMATION": "Automation",
     "TEAMS": "팀",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
index 568b642b1..05a9d045a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "팀 생성하기",
     "HEADER": "팀",
-    "SIDEBAR_TXT": "<p><b>팀</b></p><p>팀은 에이전트들을 각 역할에 따라 그룹화할 수 있게 해줍니다. <br />사용자는 여러 팀에 소속될 수 있습니다. 만약 여러 사용자가 협업해야 할 대화가 있다면 팀에 할당할 수 있습니다.</p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "계정에 연결된 에이전트가 없습니다.",
       "EDIT_TEAM": "팀 수정하기"
diff --git a/app/javascript/dashboard/i18n/locale/lv/advancedFilters.json b/app/javascript/dashboard/i18n/locale/lv/advancedFilters.json
new file mode 100644
index 000000000..f00973f29
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/advancedFilters.json
@@ -0,0 +1,86 @@
+{
+  "FILTER": {
+    "TITLE": "Filter Conversations",
+    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
+    "ADD_NEW_FILTER": "Add Filter",
+    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "CANCEL_BUTTON_LABEL": "Cancel",
+    "CLEAR_BUTTON_LABEL": "Clear Filters",
+    "EMPTY_VALUE_ERROR": "Value is required",
+    "TOOLTIP_LABEL": "Filter conversations",
+    "QUERY_DROPDOWN_LABELS": {
+      "AND": "AND",
+      "OR": "OR"
+    },
+    "OPERATOR_LABELS": {
+      "equal_to": "Equal to",
+      "not_equal_to": "Not equal to",
+      "contains": "Contains",
+      "does_not_contain": "Does not contain",
+      "is_present": "Is present",
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
+    },
+    "ATTRIBUTES": {
+      "STATUS": "Status",
+      "ASSIGNEE_NAME": "Assignee Name",
+      "INBOX_NAME": "Inbox Name",
+      "TEAM_NAME": "Team Name",
+      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
+      "CAMPAIGN_NAME": "Campaign Name",
+      "LABELS": "Labels",
+      "BROWSER_LANGUAGE": "Browser Language",
+      "COUNTRY_NAME": "Country Name",
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Custom Attributes"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Cancel",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirm Deletion",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Yes, Delete",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/agentMgmt.json b/app/javascript/dashboard/i18n/locale/lv/agentMgmt.json
new file mode 100644
index 000000000..0f965c717
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/agentMgmt.json
@@ -0,0 +1,113 @@
+{
+  "AGENT_MGMT": {
+    "HEADER": "Agents",
+    "HEADER_BTN_TXT": "Add Agent",
+    "LOADING": "Fetching Agent List",
+    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "AGENT_TYPES": {
+      "ADMINISTRATOR": "Administrator",
+      "AGENT": "Agent"
+    },
+    "LIST": {
+      "404": "There are no agents associated to this account",
+      "TITLE": "Manage agents in your team",
+      "DESC": "You can add/remove agents to/in your team.",
+      "NAME": "Name",
+      "EMAIL": "EMAIL",
+      "STATUS": "Status",
+      "ACTIONS": "Actions",
+      "VERIFIED": "Verified",
+      "VERIFICATION_PENDING": "Verification Pending"
+    },
+    "ADD": {
+      "TITLE": "Add agent to your team",
+      "DESC": "You can add people who will be able to handle support for your inboxes.",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Agent Name",
+          "PLACEHOLDER": "Please enter a name of the agent"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "Role",
+          "PLACEHOLDER": "Please select a role",
+          "ERROR": "Role is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email Address",
+          "PLACEHOLDER": "Please enter an email address of the agent"
+        },
+        "SUBMIT": "Add Agent"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Agent added successfully",
+        "EXIST_MESSAGE": "Agent email already in use, Please try another email address",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Agent deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit agent",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Agent Name",
+          "PLACEHOLDER": "Please enter a name of the agent"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "Role",
+          "PLACEHOLDER": "Please select a role",
+          "ERROR": "Role is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email Address",
+          "PLACEHOLDER": "Please enter an email address of the agent"
+        },
+        "SUBMIT": "Edit Agent"
+      },
+      "BUTTON_TEXT": "Edit",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Agent updated successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      },
+      "PASSWORD_RESET": {
+        "ADMIN_RESET_BUTTON": "Reset Password",
+        "ADMIN_SUCCESS_MESSAGE": "An email with reset password instructions has been sent to the agent",
+        "SUCCESS_MESSAGE": "Agent password reset successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "SEARCH": {
+      "NO_RESULTS": "No results found."
+    },
+    "MULTI_SELECTOR": {
+      "PLACEHOLDER": "None",
+      "TITLE": {
+        "AGENT": "Select agent",
+        "TEAM": "Select team"
+      },
+      "SEARCH": {
+        "NO_RESULTS": {
+          "AGENT": "No agents found",
+          "TEAM": "No teams found"
+        },
+        "PLACEHOLDER": {
+          "AGENT": "Search agents",
+          "TEAM": "Search teams"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
new file mode 100644
index 000000000..ff4904c34
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
@@ -0,0 +1,99 @@
+{
+  "ATTRIBUTES_MGMT": {
+    "HEADER": "Custom Attributes",
+    "HEADER_BTN_TXT": "Add Custom Attribute",
+    "LOADING": "Fetching custom attributes",
+    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "ADD": {
+      "TITLE": "Add Custom Attribute",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Display Name",
+          "PLACEHOLDER": "Enter custom attribute display name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter custom attribute description",
+          "ERROR": "Description is required"
+        },
+        "MODEL": {
+          "LABEL": "Applies to",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Model is required"
+        },
+        "TYPE": {
+          "LABEL": "Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Type is required",
+          "LIST": {
+            "LABEL": "List Values",
+            "PLACEHOLDER": "Please enter value and press enter key",
+            "ERROR": "Must have at least one value"
+          }
+        },
+        "KEY": {
+          "LABEL": "Key",
+          "PLACEHOLDER": "Enter custom attribute key",
+          "ERROR": "Key is required",
+          "IN_VALID": "Invalid key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
+        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{attributeName}",
+        "PLACE_HOLDER": "Please type {attributeName} to confirm",
+        "MESSAGE": "Deleting will remove the custom attribute",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Custom Attribute",
+      "UPDATE_BUTTON_TEXT": "Update",
+      "TYPE": {
+        "LIST": {
+          "LABEL": "List Values",
+          "PLACEHOLDER": "Please enter values and press enter key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
+        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+      }
+    },
+    "TABS": {
+      "HEADER": "Custom Attributes",
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Type",
+        "Key"
+      ],
+      "BUTTONS": {
+        "EDIT": "Edit",
+        "DELETE": "Delete"
+      },
+      "EMPTY_RESULT": {
+        "404": "There are no custom attributes created",
+        "NOT_FOUND": "There are no custom attributes configured"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/automation.json b/app/javascript/dashboard/i18n/locale/lv/automation.json
new file mode 100644
index 000000000..ee78de7c8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/automation.json
@@ -0,0 +1,89 @@
+{
+  "AUTOMATION": {
+    "HEADER": "Automation",
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Edit",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/campaign.json b/app/javascript/dashboard/i18n/locale/lv/campaign.json
new file mode 100644
index 000000000..bbcc463ee
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/campaign.json
@@ -0,0 +1,126 @@
+{
+  "CAMPAIGN": {
+    "HEADER": "Campaigns",
+    "SIDEBAR_TXT": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations. Click on <b>Add Campaign</b> to create a new campaign. You can also edit or delete an existing campaign by clicking on the Edit or Delete button.",
+    "HEADER_BTN_TXT": {
+      "ONE_OFF": "Create a one off campaign",
+      "ONGOING": "Create a ongoing campaign"
+    },
+    "ADD": {
+      "TITLE": "Create a campaign",
+      "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CREATE_BUTTON_TEXT": "Create",
+      "FORM": {
+        "TITLE": {
+          "LABEL": "Title",
+          "PLACEHOLDER": "Please enter the title of campaign",
+          "ERROR": "Title is required"
+        },
+        "SCHEDULED_AT": {
+          "LABEL": "Scheduled time",
+          "PLACEHOLDER": "Please select the time",
+          "CONFIRM": "Confirm",
+          "ERROR": "Scheduled time is required"
+        },
+        "AUDIENCE": {
+          "LABEL": "Audience",
+          "PLACEHOLDER": "Select the customer labels",
+          "ERROR": "Audience is required"
+        },
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox",
+          "ERROR": "Inbox is required"
+        },
+        "MESSAGE": {
+          "LABEL": "Message",
+          "PLACEHOLDER": "Please enter the message of campaign",
+          "ERROR": "Message is required"
+        },
+        "SENT_BY": {
+          "LABEL": "Sent by",
+          "PLACEHOLDER": "Please select the the content of campaign",
+          "ERROR": "Sender is required"
+        },
+        "END_POINT": {
+          "LABEL": "URL",
+          "PLACEHOLDER": "Please enter the URL",
+          "ERROR": "Please enter a valid URL"
+        },
+        "TIME_ON_PAGE": {
+          "LABEL": "Time on page(Seconds)",
+          "PLACEHOLDER": "Please enter the time",
+          "ERROR": "Time on page is required"
+        },
+        "ENABLED": "Enable campaign",
+        "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
+        "SUBMIT": "Add Campaign"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign created successfully",
+        "ERROR_MESSAGE": "There was an error. Please try again."
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete?",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit campaign",
+      "UPDATE_BUTTON_TEXT": "Update",
+      "API": {
+        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "LIST": {
+      "LOADING_MESSAGE": "Loading campaigns...",
+      "404": "There are no campaigns created for this inbox.",
+      "TABLE_HEADER": {
+        "TITLE": "Title",
+        "MESSAGE": "Message",
+        "INBOX": "Inbox",
+        "STATUS": "Status",
+        "SENDER": "Sender",
+        "URL": "URL",
+        "SCHEDULED_AT": "Scheduled time",
+        "TIME_ON_PAGE": "Time(Seconds)",
+        "CREATED_AT": "Created at"
+      },
+      "BUTTONS": {
+        "ADD": "Add",
+        "EDIT": "Edit",
+        "DELETE": "Delete"
+      },
+      "STATUS": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled",
+        "COMPLETED": "Completed",
+        "ACTIVE": "Active"
+      },
+      "SENDER": {
+        "BOT": "Bot"
+      }
+    },
+    "ONE_OFF": {
+      "HEADER": "One off campaigns",
+      "404": "There are no one off campaigns created",
+      "INBOXES_NOT_FOUND": "Please create an sms inbox and start adding campaigns"
+    },
+    "ONGOING": {
+      "HEADER": "Ongoing campaigns",
+      "404": "There are no ongoing campaigns created",
+      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/lv/cannedMgmt.json
new file mode 100644
index 000000000..9c14f5a52
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/cannedMgmt.json
@@ -0,0 +1,76 @@
+{
+  "CANNED_MGMT": {
+    "HEADER": "Canned Responses",
+    "HEADER_BTN_TXT": "Add Canned Response",
+    "LOADING": "Fetching Canned Responses",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "LIST": {
+      "404": "There are no canned responses available in this account.",
+      "TITLE": "Manage canned responses",
+      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
+      "TABLE_HEADER": [
+        "Short Code",
+        "Content",
+        "Actions"
+      ]
+    },
+    "ADD": {
+      "TITLE": "Add Canned Response",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Short Code",
+          "PLACEHOLDER": "Please enter a short code",
+          "ERROR": "Short Code is required"
+        },
+        "CONTENT": {
+          "LABEL": "Content",
+          "PLACEHOLDER": "Please enter a content",
+          "ERROR": "Content is required"
+        },
+        "SUBMIT": "Submit"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Canned Response added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Canned Response",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Short Code",
+          "PLACEHOLDER": "Please enter a shortcode",
+          "ERROR": "Short Code is required"
+        },
+        "CONTENT": {
+          "LABEL": "Content",
+          "PLACEHOLDER": "Please enter a content",
+          "ERROR": "Content is required"
+        },
+        "SUBMIT": "Submit"
+      },
+      "BUTTON_TEXT": "Edit",
+      "API": {
+        "SUCCESS_MESSAGE": "Canned Response updated successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Canned response deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/chatlist.json b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
new file mode 100644
index 000000000..c1ff81c2d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
@@ -0,0 +1,85 @@
+{
+  "CHAT_LIST": {
+    "LOADING": "Fetching conversations",
+    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
+    "EOF": "All conversations loaded 🎉",
+    "LIST": {
+      "404": "There are no active conversations in this group."
+    },
+    "TAB_HEADING": "Conversations",
+    "MENTION_HEADING": "Mentions",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "FILTER_ALL": "All",
+    "STATUS_TABS": [
+      {
+        "NAME": "Open",
+        "KEY": "openCount"
+      },
+      {
+        "NAME": "Resolved",
+        "KEY": "allConvCount"
+      }
+    ],
+    "ASSIGNEE_TYPE_TABS": [
+      {
+        "NAME": "Mine",
+        "KEY": "me",
+        "COUNT_KEY": "mineCount"
+      },
+      {
+        "NAME": "Unassigned",
+        "KEY": "unassigned",
+        "COUNT_KEY": "unAssignedCount"
+      },
+      {
+        "NAME": "All",
+        "KEY": "all",
+        "COUNT_KEY": "allCount"
+      }
+    ],
+    "CHAT_STATUS_FILTER_ITEMS": {
+      "open": {
+        "TEXT": "Open"
+      },
+      "resolved": {
+        "TEXT": "Resolved"
+      },
+      "pending": {
+        "TEXT": "Pending"
+      },
+      "snoozed": {
+        "TEXT": "Snoozed"
+      }
+    },
+    "ATTACHMENTS": {
+      "image": {
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "CONTENT": "has shared a url"
+      }
+    },
+    "RECEIVED_VIA_EMAIL": "Received via email",
+    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
+    "REPLY_TO_TWEET": "Reply to this tweet",
+    "SENT": "Sent successfully",
+    "NO_MESSAGES": "No Messages",
+    "NO_CONTENT": "No content available",
+    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
+    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
new file mode 100644
index 000000000..3824d9593
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -0,0 +1,331 @@
+{
+  "CONTACT_PANEL": {
+    "NOT_AVAILABLE": "Not Available",
+    "EMAIL_ADDRESS": "Email Address",
+    "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COMPANY": "Company",
+    "LOCATION": "Location",
+    "CONVERSATION_TITLE": "Conversation Details",
+    "VIEW_PROFILE": "View Profile",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "IP_ADDRESS": "IP Address",
+    "NEW_MESSAGE": "New message",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
+      },
+      "LABEL_SELECT": {
+        "TITLE": "Add Labels",
+        "PLACEHOLDER": "Search labels",
+        "NO_RESULT": "No labels found"
+      }
+    },
+    "MERGE_CONTACT": "Merge contact",
+    "CONTACT_ACTIONS": "Contact actions",
+    "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
+    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "SEND_TRANSCRIPT": "Send Transcript",
+    "EDIT_LABEL": "Edit",
+    "SIDEBAR_SECTIONS": {
+      "CUSTOM_ATTRIBUTES": "Custom Attributes",
+      "CONTACT_LABELS": "Contact Labels",
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+    }
+  },
+  "EDIT_CONTACT": {
+    "BUTTON_LABEL": "Edit Contact",
+    "TITLE": "Edit contact",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "IMPORT_CONTACTS": {
+    "BUTTON_LABEL": "Import",
+    "TITLE": "Import Contacts",
+    "DESC": "Import contacts through a CSV file.",
+    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "FORM": {
+      "LABEL": "CSV File",
+      "SUBMIT": "Import",
+      "CANCEL": "Cancel"
+    },
+    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "DELETE_CONTACT": {
+    "BUTTON_LABEL": "Delete Contact",
+    "TITLE": "Delete contact",
+    "DESC": "Delete contact details",
+    "CONFIRM": {
+      "TITLE": "Confirm Deletion",
+      "MESSAGE": "Are you sure to delete ",
+      "PLACE_HOLDER": "Please type {contactName} to confirm",
+      "YES": "Yes, Delete ",
+      "NO": "No, Keep "
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Contact deleted successfully",
+      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+    }
+  },
+  "CONTACT_FORM": {
+    "FORM": {
+      "SUBMIT": "Submit",
+      "CANCEL": "Cancel",
+      "AVATAR": {
+        "LABEL": "Contact Avatar"
+      },
+      "NAME": {
+        "PLACEHOLDER": "Enter the full name of the contact",
+        "LABEL": "Full Name"
+      },
+      "BIO": {
+        "PLACEHOLDER": "Enter the bio of the contact",
+        "LABEL": "Bio"
+      },
+      "EMAIL_ADDRESS": {
+        "PLACEHOLDER": "Enter the email address of the contact",
+        "LABEL": "Email Address",
+        "DUPLICATE": "This email address is in use for another contact."
+      },
+      "PHONE_NUMBER": {
+        "PLACEHOLDER": "Enter the phone number of the contact",
+        "LABEL": "Phone Number",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "ERROR": "Phone number should be either empty or of E.164 format",
+        "DUPLICATE": "This phone number is in use for another contact."
+      },
+      "LOCATION": {
+        "PLACEHOLDER": "Enter the location of the contact",
+        "LABEL": "Location"
+      },
+      "COMPANY_NAME": {
+        "PLACEHOLDER": "Enter the company name",
+        "LABEL": "Company Name"
+      },
+      "SOCIAL_PROFILES": {
+        "FACEBOOK": {
+          "PLACEHOLDER": "Enter the Facebook username",
+          "LABEL": "Facebook"
+        },
+        "TWITTER": {
+          "PLACEHOLDER": "Enter the Twitter username",
+          "LABEL": "Twitter"
+        },
+        "LINKEDIN": {
+          "PLACEHOLDER": "Enter the LinkedIn username",
+          "LABEL": "LinkedIn"
+        },
+        "GITHUB": {
+          "PLACEHOLDER": "Enter the Github username",
+          "LABEL": "Github"
+        }
+      }
+    },
+    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "NEW_CONVERSATION": {
+    "BUTTON_LABEL": "Start conversation",
+    "TITLE": "New conversation",
+    "DESC": "Start a new conversation by sending a new message.",
+    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "FORM": {
+      "TO": {
+        "LABEL": "To"
+      },
+      "INBOX": {
+        "LABEL": "Inbox",
+        "ERROR": "Select an inbox"
+      },
+      "SUBJECT": {
+        "LABEL": "Subject",
+        "PLACEHOLDER": "Subject",
+        "ERROR": "Subject can't be empty"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Write your message here",
+        "ERROR": "Message can't be empty"
+      },
+      "SUBMIT": "Send message",
+      "CANCEL": "Cancel",
+      "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "View",
+      "ERROR_MESSAGE": "Couldn't send! try again"
+    }
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "FIELDS": "Contact fields",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "NO_CONTACTS": "There are no available contacts",
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
+    }
+  },
+  "CONTACT_PROFILE": {
+    "BACK_BUTTON": "Contacts",
+    "LOADING": "Loading contact profile..."
+  },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
+  "NOTES": {
+    "FETCHING_NOTES": "Fetching notes...",
+    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "HEADER": {
+      "TITLE": "Notes"
+    },
+    "LIST": {
+      "LABEL": "added a note"
+    },
+    "ADD": {
+      "BUTTON": "Add",
+      "PLACEHOLDER": "Add a note",
+      "TITLE": "Shift + Enter to create a note"
+    },
+    "CONTENT_HEADER": {
+      "DELETE": "Delete note"
+    }
+  },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Add attributes",
+    "BUTTON": "Add custom attribute",
+    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "ACTIONS": {
+      "COPY": "Copy attribute",
+      "DELETE": "Delete attribute",
+      "EDIT": "Edit attribute"
+    },
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      },
+      "ADD": {
+        "TITLE": "Create new attribute ",
+        "SUCCESS": "Attribute added successfully",
+        "ERROR": "Unable to add attribute. Please try again later"
+      },
+      "UPDATE": {
+        "SUCCESS": "Attribute updated successfully",
+        "ERROR": "Unable to update attribute. Please try again later"
+      },
+      "DELETE": {
+        "SUCCESS": "Attribute deleted successfully",
+        "ERROR": "Unable to delete attribute. Please try again later"
+      },
+      "ATTRIBUTE_SELECT": {
+        "TITLE": "Add attributes",
+        "PLACEHOLDER": "Search attributes",
+        "NO_RESULT": "No attributes found"
+      },
+      "ATTRIBUTE_TYPE": {
+        "LIST": {
+          "PLACEHOLDER": "Select value",
+          "SEARCH_INPUT_PLACEHOLDER": "Search value",
+          "NO_RESULT": "No result found"
+        }
+      }
+    },
+    "VALIDATIONS": {
+      "REQUIRED": "Valid value is required",
+      "INVALID_URL": "Invalid URL"
+    }
+  },
+  "MERGE_CONTACTS": {
+    "TITLE": "Merge contacts",
+    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "PRIMARY": {
+      "TITLE": "Primary contact",
+      "HELP_LABEL": "To be kept"
+    },
+    "CHILD": {
+      "TITLE": "Contact to merge",
+      "PLACEHOLDER": "Search for a contact",
+      "HELP_LABEL": "To be deleted"
+    },
+    "SUMMARY": {
+      "TITLE": "Summary",
+      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
+      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+    },
+    "SEARCH": {
+      "ERROR": "ERROR_MESSAGE"
+    },
+    "FORM": {
+      "SUBMIT": " Merge contacts",
+      "CANCEL": "Cancel",
+      "CHILD_CONTACT": {
+        "ERROR": "Select a child contact to merge"
+      },
+      "SUCCESS_MESSAGE": "Contact merged successfully",
+      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/contactFilters.json b/app/javascript/dashboard/i18n/locale/lv/contactFilters.json
new file mode 100644
index 000000000..a752d537c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/contactFilters.json
@@ -0,0 +1,46 @@
+{
+    "CONTACTS_FILTER": {
+        "TITLE": "Filter Contacts",
+        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
+        "ADD_NEW_FILTER": "Add Filter",
+        "CLEAR_ALL_FILTERS": "Clear All Filters",
+        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "SUBMIT_BUTTON_LABEL": "Submit",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CLEAR_BUTTON_LABEL": "Clear Filters",
+        "EMPTY_VALUE_ERROR": "Value is required",
+        "TOOLTIP_LABEL": "Filter contacts",
+        "QUERY_DROPDOWN_LABELS": {
+            "AND": "AND",
+            "OR": "OR"
+        },
+        "OPERATOR_LABELS": {
+            "equal_to": "Equal to",
+            "not_equal_to": "Not equal to",
+            "contains": "Contains",
+            "does_not_contain": "Does not contain",
+            "is_present": "Is present",
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
+        },
+        "ATTRIBUTES": {
+            "NAME": "Name",
+            "EMAIL": "Email",
+            "PHONE_NUMBER": "Phone number",
+            "IDENTIFIER": "Identifier",
+            "CITY": "City",
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
+        }
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
new file mode 100644
index 000000000..c545502ec
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -0,0 +1,192 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
+    "NO_MESSAGE_2": " to send a message to your page!",
+    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
+    "NO_INBOX_2": " to get started",
+    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "RESULT_TITLE": "Search Results",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "No results found."
+    },
+    "UNREAD_MESSAGES": "Unread Messages",
+    "UNREAD_MESSAGE": "Unread Message",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "CANNOT_REPLY": "You cannot reply due to",
+    "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
+    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
+    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "REPLYING_TO": "You are replying to:",
+    "REMOVE_SELECTION": "Remove Selection",
+    "DOWNLOAD": "Download",
+    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
+    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "NO_RESPONSE": "No response",
+    "RATING_TITLE": "Rating",
+    "FEEDBACK_TITLE": "Feedback",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN_ACTION": "Open",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+    },
+    "RESOLVE_DROPDOWN": {
+      "MARK_PENDING": "Mark as pending",
+      "SNOOZE": {
+        "TITLE": "Snooze until",
+        "NEXT_REPLY": "Next reply",
+        "TOMORROW": "Tomorrow",
+        "NEXT_WEEK": "Next week"
+      }
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet",
+      "TIP_FORMAT_ICON": "Show rich text editor",
+      "TIP_EMOJI_ICON": "Show emoji selector",
+      "TIP_ATTACH_ICON": "Attach files",
+      "ENTER_TO_SEND": "Enter to send",
+      "DRAG_DROP": "Drag and drop here to attach",
+      "EMAIL_HEAD": {
+        "ADD_BCC": "Add bcc",
+        "CC": {
+          "LABEL": "CC",
+          "PLACEHOLDER": "Emails separated by commas",
+          "ERROR": "Please enter valid email addresses"
+        },
+        "BCC": {
+          "LABEL": "BCC",
+          "PLACEHOLDER": "Emails separated by commas",
+          "ERROR": "Please enter valid email addresses"
+        }
+      }
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
+    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+    "MESSAGE_ERROR": "Unable to send this message, please try again later",
+    "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
+    "ASSIGNMENT": {
+      "SELECT_AGENT": "Select Agent",
+      "REMOVE": "Remove",
+      "ASSIGN": "Assign"
+    },
+    "CONTEXT_MENU": {
+      "COPY": "Copy",
+      "DELETE": "Delete"
+    }
+  },
+  "EMAIL_TRANSCRIPT": {
+    "TITLE": "Send conversation transcript",
+    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "SUBMIT": "Submit",
+    "CANCEL": "Cancel",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "FORM": {
+      "SEND_TO_CONTACT": "Send the transcript to the customer",
+      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "EMAIL": {
+        "PLACEHOLDER": "Enter an email address",
+        "ERROR": "Please enter a valid email address"
+      }
+    }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    },
+    "ACCORDION": {
+      "CONTACT_DETAILS": "Contact Details",
+      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONVERSATION_LABELS": "Conversation Labels",
+      "CONVERSATION_INFO": "Conversation Information",
+      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "PREVIOUS_CONVERSATION": "Previous Conversations"
+    }
+  },
+  "CONVERSATION_CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Create attribute",
+    "UPDATE": {
+      "SUCCESS": "Attribute updated successfully",
+      "ERROR": "Unable to update attribute. Please try again later"
+    },
+    "ADD": {
+      "TITLE": "Add",
+      "SUCCESS": "Attribute added successfully",
+      "ERROR": "Unable to add attribute. Please try again later"
+    },
+    "DELETE": {
+      "SUCCESS": "Attribute deleted successfully",
+      "ERROR": "Unable to delete attribute. Please try again later"
+    },
+    "ATTRIBUTE_SELECT": {
+      "TITLE": "Add attributes",
+      "PLACEHOLDER": "Search attributes",
+      "NO_RESULT": "No attributes found"
+    }
+  },
+  "EMAIL_HEADER": {
+    "TO": "To",
+    "BCC": "Bcc",
+    "CC": "Cc",
+    "SUBJECT": "Subject"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/csatMgmt.json b/app/javascript/dashboard/i18n/locale/lv/csatMgmt.json
new file mode 100644
index 000000000..d7d2efc2a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/csatMgmt.json
@@ -0,0 +1,6 @@
+{
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "PLACEHOLDER": "Tell us more..."
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
new file mode 100644
index 000000000..8a8997df6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -0,0 +1,131 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Account settings",
+    "SUBMIT": "Update settings",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Could not update settings, try again!",
+      "SUCCESS": "Successfully updated account settings"
+    },
+    "FORM": {
+      "ERROR": "Please fix form errors",
+      "GENERAL_SECTION": {
+        "TITLE": "General settings",
+        "NOTE": ""
+      },
+      "ACCOUNT_ID": {
+        "TITLE": "Account ID",
+        "NOTE": "This ID is required if you are building an API based integration"
+      },
+      "NAME": {
+        "LABEL": "Account name",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": "Please enter a valid account name"
+      },
+      "LANGUAGE": {
+        "LABEL": "Site language (Beta)",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Incoming Email Domain",
+        "PLACEHOLDER": "The domain where you will receive the emails",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+      },
+      "FEATURES": {
+        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+      }
+    },
+    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance."
+  },
+  "FORMS": {
+    "MULTISELECT": {
+      "ENTER_TO_SELECT": "Press enter to select",
+      "ENTER_TO_REMOVE": "Press enter to remove",
+      "SELECT_ONE": "Select one"
+    }
+  },
+  "NOTIFICATIONS_PAGE": {
+    "HEADER": "Notifications",
+    "MARK_ALL_DONE": "Mark All Done",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading notifications...",
+      "404": "No Notifications",
+      "TABLE_HEADER": [
+        "Name",
+        "Phone Number",
+        "Conversations",
+        "Last Contacted"
+      ]
+    },
+    "TYPE_LABEL": {
+      "conversation_creation": "New conversation",
+      "conversation_assignment": "Conversation Assigned",
+      "assigned_conversation_new_message": "New Message",
+      "conversation_mention": "Mention"
+    }
+  },
+  "NETWORK": {
+    "NOTIFICATION": {
+      "TEXT": "Disconnected from Chatwoot"
+    },
+    "BUTTON": {
+      "REFRESH": "Refresh"
+    }
+  },
+  "COMMAND_BAR": {
+    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SECTIONS": {
+      "GENERAL": "General",
+      "REPORTS": "Reports",
+      "CONVERSATION": "Conversation",
+      "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_TEAM": "Change Team",
+      "ADD_LABEL": "Add label to the conversation",
+      "REMOVE_LABEL": "Remove label from the conversation",
+      "SETTINGS": "Settings"
+    },
+    "COMMANDS": {
+      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
+      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
+      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
+      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
+      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
+      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
+      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
+      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
+      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
+      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
+      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
+      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
+      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
+      "GO_TO_NOTIFICATIONS": "Go to Notifications",
+      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
+      "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_A_TEAM": "Assign a team",
+      "MUTE_CONVERSATION": "Mute conversation",
+      "UNMUTE_CONVERSATION": "Unmute conversation",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
+      "REOPEN_CONVERSATION": "Reopen conversation",
+      "RESOLVE_CONVERSATION": "Resolve conversation",
+      "SEND_TRANSCRIPT": "Send an email transcript",
+      "SNOOZE_CONVERSATION": "Snooze Conversation",
+      "UNTIL_NEXT_REPLY": "Until next reply",
+      "UNTIL_NEXT_WEEK": "Until next week",
+      "UNTIL_TOMORROW": "Until tomorrow"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
new file mode 100644
index 000000000..a04e3d49b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -0,0 +1,527 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Inboxes",
+    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "LIST": {
+      "404": "There are no inboxes attached to this account."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Choose Channel",
+        "route": "settings_inbox_new",
+        "body": "Choose the provider you want to integrate with Chatwoot."
+      },
+      {
+        "title": "Create Inbox",
+        "route": "settings_inboxes_page_channel",
+        "body": "Authenticate your account and create an inbox."
+      },
+      {
+        "title": "Add Agents",
+        "route": "settings_inboxes_add_agents",
+        "body": "Add agents to the created inbox."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "You are all set to go!"
+      }
+    ],
+    "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
+      "FB": {
+        "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
+        "CHOOSE_PAGE": "Choose Page",
+        "CHOOSE_PLACEHOLDER": "Select a page from the list",
+        "INBOX_NAME": "Inbox Name",
+        "ADD_NAME": "Add a name for your inbox",
+        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_A_VALUE": "Pick a value"
+      },
+      "TWITTER": {
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "TWEETS": {
+          "ENABLE": "Create conversations from mentioned Tweets"
+        }
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Website channel",
+        "DESC": "Create a channel for your website and start supporting your customers via our website widget.",
+        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Enter your Webhook URL",
+          "ERROR": "Please enter a valid URL"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Website Domain",
+          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Welcome Heading",
+          "PLACEHOLDER": "Hi there !"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "Channel greeting message",
+          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Widget Color",
+          "PLACEHOLDER": "Update the widget color used in widget"
+        },
+        "SUBMIT_BUTTON": "Create inbox"
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/WhatsApp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "ACCOUNT_SID": {
+          "LABEL": "Account SID",
+          "PLACEHOLDER": "Please enter your Twilio Account SID",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Auth Token",
+          "PLACEHOLDER": "Please enter your Twilio Auth Token",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter a inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+        }
+      },
+      "SMS": {
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Phone number",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
+      },
+      "WHATSAPP": {
+        "TITLE": "WhatsApp Channel",
+        "DESC": "Start supporting your customers via WhatsApp.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "360_DIALOG": "360Dialog"
+        },
+        "INBOX_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter an inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_KEY": {
+          "LABEL": "API key",
+          "SUBTITLE": "Configure the WhatsApp API key.",
+          "PLACEHOLDER": "API key",
+          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
+          "ERROR": "Please enter a valid value."
+        },
+        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+        }
+      },
+      "API_CHANNEL": {
+        "TITLE": "API Channel",
+        "DESC": "Integrate with API channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "PLACEHOLDER": "Webhook URL"
+        },
+        "SUBMIT_BUTTON": "Create API Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the api channel"
+        }
+      },
+      "EMAIL_CHANNEL": {
+        "TITLE": "Email Channel",
+        "DESC": "Integrate you email inbox.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email",
+          "SUBTITLE": "Email where your customers sends you support tickets",
+          "PLACEHOLDER": "Email"
+        },
+        "SUBMIT_BUTTON": "Create Email Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the email channel"
+        },
+        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+      },
+      "LINE_CHANNEL": {
+        "TITLE": "LINE Channel",
+        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "LINE_CHANNEL_ID": {
+          "LABEL": "LINE Channel ID",
+          "PLACEHOLDER": "LINE Channel ID"
+        },
+        "LINE_CHANNEL_SECRET": {
+          "LABEL": "LINE Channel Secret",
+          "PLACEHOLDER": "LINE Channel Secret"
+        },
+        "LINE_CHANNEL_TOKEN": {
+          "LABEL": "LINE Channel Token",
+          "PLACEHOLDER": "LINE Channel Token"
+        },
+        "SUBMIT_BUTTON": "Create LINE Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+        }
+      },
+      "TELEGRAM_CHANNEL": {
+        "TITLE": "Telegram Channel",
+        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "BOT_TOKEN": {
+          "LABEL": "Bot Token",
+          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
+          "PLACEHOLDER": "Bot Token"
+        },
+        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Choose a channel",
+        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+      },
+      "AGENTS": {
+        "TITLE": "Agents",
+        "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
+        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "PICK_AGENTS": "Pick agents for the inbox"
+      },
+      "DETAILS": {
+        "TITLE": "Inbox Details",
+        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+      },
+      "FINISH": {
+        "TITLE": "Nailed It!",
+        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Authenticating you with Facebook...",
+      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
+      "CREATING_CHANNEL": "Creating your Inbox...",
+      "TITLE": "Configure Inbox Details",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Inbox..."
+    },
+    "FINISH": {
+      "TITLE": "Your Inbox is ready!",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "BUTTON_TEXT": "Take me there",
+      "MORE_SETTINGS": "More settings",
+      "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
+    },
+    "REAUTH": "Reauthorize",
+    "VIEW": "View",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
+        "ERROR_MESSAGE": "Could not update widget color. Please try again later."
+      },
+      "AUTO_ASSIGNMENT": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CSAT": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_HMAC": {
+        "LABEL": "Enable"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later.",
+        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
+        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+      }
+    },
+    "TABS": {
+      "SETTINGS": "Settings",
+      "COLLABORATORS": "Collaborators",
+      "CONFIGURATION": "Configuration",
+      "CAMPAIGN": "Campaigns",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
+    },
+    "SETTINGS": "Settings",
+    "FEATURES": {
+      "LABEL": "Features",
+      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
+      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+    },
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Messenger Script",
+      "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
+      "INBOX_AGENTS": "Agents",
+      "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
+      "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "ENABLE_CSAT": "Enable CSAT",
+      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
+      "HMAC_VERIFICATION": "User Identity Validation",
+      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
+      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
+      "INBOX_IDENTIFIER": "Inbox Identifier",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
+      "FORWARD_EMAIL_TITLE": "Forward to Email",
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "ENABLE": {
+        "LABEL": "Enable pre chat form",
+        "OPTIONS": {
+          "ENABLED": "Yes",
+          "DISABLED": "No"
+        }
+      },
+      "PRE_CHAT_MESSAGE": {
+        "LABEL": "Pre Chat Message",
+        "PLACEHOLDER": "This message would be visible to the users along with the form"
+      },
+      "REQUIRE_EMAIL": {
+        "LABEL": "Visitors should provide their name and email address before starting the chat"
+      }
+    },
+    "BUSINESS_HOURS": {
+      "TITLE": "Set your availability",
+      "SUBTITLE": "Set your availability on your livechat widget",
+      "WEEKLY_TITLE": "Set your weekly hours",
+      "TIMEZONE_LABEL": "Select timezone",
+      "UPDATE": "Update business hours settings",
+      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "DAY": {
+        "ENABLE": "Enable availability for this day",
+        "UNAVAILABLE": "Unavailable",
+        "HOURS": "hours",
+        "VALIDATION_ERROR": "Starting time should be before closing time.",
+        "CHOOSE": "Choose"
+      }
+    },
+    "IMAP": {
+      "TITLE": "IMAP",
+      "SUBTITLE": "Set your IMAP details",
+      "UPDATE": "Update IMAP settings",
+      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
+      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "EDIT": {
+        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
+        "ERROR_MESSAGE": "Unable to update IMAP settings"
+      },
+      "ADDRESS": {
+        "LABEL": "Address",
+        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+      },
+      "PORT": {
+        "LABEL": "Port",
+        "PLACE_HOLDER": "Port"
+      },
+      "EMAIL": {
+        "LABEL": "Email",
+        "PLACE_HOLDER": "Email"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
+      },
+      "ENABLE_SSL": "Enable SSL"
+    },
+    "SMTP": {
+      "TITLE": "SMTP",
+      "SUBTITLE": "Set your SMTP details",
+      "UPDATE": "Update SMTP settings",
+      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
+      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "EDIT": {
+        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
+        "ERROR_MESSAGE": "Unable to update SMTP settings"
+      },
+      "ADDRESS": {
+        "LABEL": "Address",
+        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+      },
+      "PORT": {
+        "LABEL": "Port",
+        "PLACE_HOLDER": "Port"
+      },
+      "EMAIL": {
+        "LABEL": "Email",
+        "PLACE_HOLDER": "Email"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACE_HOLDER": "Domain"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/index.js b/app/javascript/dashboard/i18n/locale/lv/index.js
new file mode 100644
index 000000000..5c1449fab
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/index.js
@@ -0,0 +1,49 @@
+import { default as _advancedFilters } from './advancedFilters.json';
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
+import { default as _campaign } from './campaign.json';
+import { default as _cannedMgmt } from './cannedMgmt.json';
+import { default as _chatlist } from './chatlist.json';
+import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
+import { default as _conversation } from './conversation.json';
+import { default as _csatMgmtMgmt } from './csatMgmt.json';
+import { default as _generalSettings } from './generalSettings.json';
+import { default as _inboxMgmt } from './inboxMgmt.json';
+import { default as _integrationApps } from './integrationApps.json';
+import { default as _integrations } from './integrations.json';
+import { default as _labelsMgmt } from './labelsMgmt.json';
+import { default as _login } from './login.json';
+import { default as _report } from './report.json';
+import { default as _resetPassword } from './resetPassword.json';
+import { default as _setNewPassword } from './setNewPassword.json';
+import { default as _settings } from './settings.json';
+import { default as _signup } from './signup.json';
+import { default as _teamsSettings } from './teamsSettings.json';
+
+export default {
+  ..._advancedFilters,
+  ..._agentMgmt,
+  ..._attributesMgmt,
+  ..._automation,
+  ..._campaign,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._contactFilters,
+  ..._conversation,
+  ..._csatMgmtMgmt,
+  ..._generalSettings,
+  ..._inboxMgmt,
+  ..._integrationApps,
+  ..._integrations,
+  ..._labelsMgmt,
+  ..._login,
+  ..._report,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._teamsSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrationApps.json b/app/javascript/dashboard/i18n/locale/lv/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/integrationApps.json
@@ -0,0 +1,62 @@
+{
+  "INTEGRATION_APPS": {
+    "FETCHING": "Fetching Integrations",
+    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
+    "HEADER": "Applications",
+    "STATUS": {
+      "ENABLED": "Enabled",
+      "DISABLED": "Disabled"
+    },
+    "CONFIGURE": "Configure",
+    "ADD_BUTTON": "Add a new hook",
+    "DELETE": {
+      "TITLE": {
+        "INBOX": "Confirm deletion",
+        "ACCOUNT": "Disconnect"
+      },
+      "MESSAGE": {
+        "INBOX": "Are you sure to delete?",
+        "ACCOUNT": "Are you sure to disconnect?"
+      },
+      "CONFIRM_BUTTON_TEXT": {
+        "INBOX": "Yes, Delete",
+        "ACCOUNT": "Yes, Disconnect"
+      },
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "LIST": {
+      "FETCHING": "Fetching integration hooks",
+      "INBOX": "Inbox",
+      "DELETE": {
+        "BUTTON_TEXT": "Delete"
+      }
+    },
+    "ADD": {
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Select Inbox",
+          "PLACEHOLDER": "Select Inbox"
+        },
+        "SUBMIT": "Create",
+        "CANCEL": "Cancel"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DISCONNECT": {
+      "BUTTON_TEXT": "Disconnect"
+    },
+    "SIDEBAR_DESCRIPTION": {
+      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
new file mode 100644
index 000000000..a54d8e9e0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -0,0 +1,85 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "LOADING": "Fetching attached webhooks",
+      "SEARCH_404": "There are no items matching this query",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks are HTTP callbacks which can be defined for every account. They are triggered by events like message creation in Chatwoot. You can create more than one webhook for this account. <br /><br /> For creating a <b>webhook</b>, click on the <b>Add new webhook</b> button. You can also remove any existing webhook by clicking on the Delete button.</p>",
+      "LIST": {
+        "404": "There are no webhooks configured for this account.",
+        "TITLE": "Manage webhooks",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "EDIT": {
+        "BUTTON_TEXT": "Edit",
+        "TITLE": "Edit webhook",
+        "CANCEL": "Cancel",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Edit webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "SLACK": {
+      "HELP_TEXT": {
+        "TITLE": "Using Slack Integration",
+        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/lv/labelsMgmt.json
new file mode 100644
index 000000000..db12fa32a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/labelsMgmt.json
@@ -0,0 +1,70 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
+    "LIST": {
+      "404": "There are no labels available in this account.",
+      "TITLE": "Manage labels",
+      "DESC": "Labels let you group the conversations together.",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "REQUIRED_ERROR": "Label name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add label",
+      "DESC": "Labels let you group the conversations together.",
+      "API": {
+        "SUCCESS_MESSAGE": "Label added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit label",
+      "API": {
+        "SUCCESS_MESSAGE": "Label updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/login.json b/app/javascript/dashboard/i18n/locale/lv/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Login to Chatwoot",
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "Email eg: someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Login Successful",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "UNAUTH": "Username / Password Incorrect. Please try again"
+    },
+    "FORGOT_PASSWORD": "Forgot your password?",
+    "CREATE_NEW_ACCOUNT": "Create new account",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/report.json b/app/javascript/dashboard/i18n/locale/lv/report.json
new file mode 100644
index 000000000..4afd63b61
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/report.json
@@ -0,0 +1,342 @@
+{
+  "REPORT": {
+    "HEADER": "Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First response time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "AGENT_REPORTS": {
+    "HEADER": "Agents Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "FILTER_DROPDOWN_LABEL": "Select Agent",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First response time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "LABEL_REPORTS": {
+    "HEADER": "Labels Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
+    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First response time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "INBOX_REPORTS": {
+    "HEADER": "Inbox Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
+    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First response time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "TEAM_REPORTS": {
+    "HEADER": "Team Overview",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
+    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "METRICS": {
+      "CONVERSATIONS": {
+        "NAME": "Conversations",
+        "DESC": "( Total )"
+      },
+      "INCOMING_MESSAGES": {
+        "NAME": "Incoming Messages",
+        "DESC": "( Total )"
+      },
+      "OUTGOING_MESSAGES": {
+        "NAME": "Outgoing Messages",
+        "DESC": "( Total )"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "NAME": "First response time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )"
+      },
+      "RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      }
+    },
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      },
+      {
+        "id": 2,
+        "name": "Last 3 months"
+      },
+      {
+        "id": 3,
+        "name": "Last 6 months"
+      },
+      {
+        "id": 4,
+        "name": "Last year"
+      },
+      {
+        "id": 5,
+        "name": "Custom date range"
+      }
+    ],
+    "CUSTOM_DATE_RANGE": {
+      "CONFIRM": "Apply",
+      "PLACEHOLDER": "Select date range"
+    }
+  },
+  "CSAT_REPORTS": {
+    "HEADER": "CSAT Reports",
+    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "TABLE": {
+      "HEADER": {
+        "CONTACT_NAME": "Contact",
+        "AGENT_NAME": "Assigned agent",
+        "RATING": "Rating",
+        "FEEDBACK_TEXT": "Feedback comment"
+      }
+    },
+    "METRIC": {
+      "TOTAL_RESPONSES": {
+        "LABEL": "Total responses",
+        "TOOLTIP": "Total number of responses collected"
+      },
+      "SATISFACTION_SCORE": {
+        "LABEL": "Satisfaction score",
+        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+      },
+      "RESPONSE_RATE": {
+        "LABEL": "Response rate",
+        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/javascript/dashboard/i18n/locale/lv/resetPassword.json b/app/javascript/dashboard/i18n/locale/lv/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/resetPassword.json
@@ -0,0 +1,15 @@
+{
+  "RESET_PASSWORD": {
+    "TITLE": "Reset Password",
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "Please enter your email",
+      "ERROR": "Please enter a valid email"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json b/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
new file mode 100644
index 000000000..4de2ffb74
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -0,0 +1,216 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "DELETE_AVATAR": "Delete Avatar",
+    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
+    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
+    "UPDATE_SUCCESS": "Your profile has been updated successfully",
+    "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices.",
+        "BTN_TEXT": "Change password"
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "AUDIO_NOTIFICATIONS_SECTION": {
+        "TITLE": "Audio Notifications",
+        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "NONE": "None",
+        "ASSIGNED": "Assigned Conversations",
+        "ALL_CONVERSATIONS": "All Conversations"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "Email Notifications",
+        "NOTE": "Update your email notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
+        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "Push Notifications",
+        "NOTE": "Update your push notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your full name",
+        "ERROR": "Please enter a valid full name",
+        "PLACEHOLDER": "Please enter your full name"
+      },
+      "DISPLAY_NAME": {
+        "LABEL": "Display name",
+        "ERROR": "Please enter a valid display name",
+        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          "Online",
+          "Busy",
+          "Offline"
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Your email address",
+        "ERROR": "Please enter a valid email address",
+        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+      },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
+      "PASSWORD": {
+        "LABEL": "New password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your new password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_AVAILABILITY_STATUS": "Change",
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "CONTACT_SUPPORT": "Contact Support",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now",
+    "DELETED_USER": "Deleted User"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "ALL_CONVERSATIONS": "All Conversations",
+    "MENTIONED_CONVERSATIONS": "Mentions",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "CONTACTS": "Contacts",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "NOTIFICATIONS": "Notifications",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
+    "LABELS": "Labels",
+    "CUSTOM_ATTRIBUTES": "Custom Attributes",
+    "AUTOMATION": "Automation",
+    "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
+    "ALL_CONTACTS": "All Contacts",
+    "TAGGED_WITH": "Tagged with",
+    "NEW_LABEL": "New label",
+    "NEW_TEAM": "New team",
+    "NEW_INBOX": "New inbox",
+    "REPORTS_OVERVIEW": "Overview",
+    "CSAT": "CSAT",
+    "CAMPAIGNS": "Campaigns",
+    "ONGOING": "Ongoing",
+    "ONE_OFF": "One off",
+    "REPORTS_AGENT": "Agents",
+    "REPORTS_LABEL": "Labels",
+    "REPORTS_INBOX": "Inbox",
+    "REPORTS_TEAM": "Team",
+    "SET_AVAILABILITY_TITLE": "Set yourself as"
+  },
+  "CREATE_ACCOUNT": {
+    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
+    "NEW_ACCOUNT": "New Account",
+    "SELECTOR_SUBTITLE": "Create a new account",
+    "API": {
+      "SUCCESS_MESSAGE": "Account created successfully",
+      "EXIST_MESSAGE": "Account already exists",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Account Name",
+        "PLACEHOLDER": "Wayne Enterprises"
+      },
+      "SUBMIT": "Submit"
+    }
+  },
+  "KEYBOARD_SHORTCUTS": {
+    "TITLE": {
+      "OPEN_CONVERSATION": "Open conversation",
+      "RESOLVE_AND_NEXT": "Resolve and move to next",
+      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
+      "RESOLVE_CONVERSATION": "Resolve Conversation",
+      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
+      "ADD_ATTACHMENT": "Add Attachment",
+      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "TOGGLE_SIDEBAR": "Toggle Sidebar",
+      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
+      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
+      "GO_TO_SETTINGS": "Go to Settings",
+      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
+      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
+      "SWITCH_TO_REPLY": "Switch to Reply",
+      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+    },
+    "KEYS": {
+      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
+      "ALT_OR_OPTION_KEY": "Alt / ⌥",
+      "FORWARD_SLASH_KEY": "/"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/signup.json b/app/javascript/dashboard/i18n/locale/lv/signup.json
new file mode 100644
index 000000000..6eaa5d646
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/signup.json
@@ -0,0 +1,38 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "Register an account",
+    "TITLE": "Register",
+    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "ACCOUNT_NAME": {
+      "LABEL": "Account name",
+      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
+      "ERROR": "Account name is too short"
+    },
+    "FULL_NAME": {
+      "LABEL": "Full name",
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Work email",
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Email address is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit",
+    "HAVE_AN_ACCOUNT": "Already have an account?"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/teamsSettings.json b/app/javascript/dashboard/i18n/locale/lv/teamsSettings.json
new file mode 100644
index 000000000..8edff5699
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/teamsSettings.json
@@ -0,0 +1,125 @@
+{
+  "TEAMS_SETTINGS": {
+    "NEW_TEAM": "Create new team",
+    "HEADER": "Teams",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "LIST": {
+      "404": "There are no teams created on this account.",
+      "EDIT_TEAM": "Edit team"
+    },
+    "CREATE_FLOW": {
+      "CREATE": {
+        "TITLE": "Create a new team",
+        "DESC": "Add a title and description to your new team."
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Add agents to team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+      },
+      "WIZARD": [
+        {
+          "title": "Create",
+          "route": "settings_teams_new",
+          "body": "Create a new team of agents."
+        },
+        {
+          "title": "Add Agents",
+          "route": "settings_teams_add_agents",
+          "body": "Add agents to the team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "EDIT_FLOW": {
+      "CREATE": {
+        "TITLE": "Edit your team details",
+        "DESC": "Edit title and description to your team.",
+        "BUTTON_TEXT": "Update team"
+      },
+      "AGENTS": {
+        "BUTTON_TEXT": "Update agents in team",
+        "TITLE": "Add agents to team - %{teamName}",
+        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+      },
+      "WIZARD": [
+        {
+          "title": "Team details",
+          "route": "settings_teams_edit",
+          "body": "Change name, description and other details."
+        },
+        {
+          "title": "Edit Agents",
+          "route": "settings_teams_edit_members",
+          "body": "Edit agents in your team."
+        },
+        {
+          "title": "Finish",
+          "route": "settings_teams_edit_finish",
+          "body": "You are all set to go!"
+        }
+      ]
+    },
+    "TEAM_FORM": {
+      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+    },
+    "AGENTS": {
+      "AGENT": "AGENT",
+      "EMAIL": "EMAIL",
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Team...",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+    },
+    "ADD": {
+      "TITLE": "Add agents to team - %{teamName}",
+      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
+      "SELECT": "select",
+      "SELECT_ALL": "select all agents",
+      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "BUTTON_TEXT": "Add agents",
+      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+    },
+    "FINISH": {
+      "TITLE": "Your team is ready!",
+      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "BUTTON_TEXT": "Finish"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{teamName}",
+        "PLACE_HOLDER": "Please type {teamName} to confirm",
+        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "SETTINGS": "Settings",
+    "FORM": {
+      "UPDATE": "Update team",
+      "CREATE": "Create team",
+      "NAME": {
+        "LABEL": "Team name",
+        "PLACEHOLDER": "Example: Sales, Customer Support"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Team Description",
+        "PLACEHOLDER": "Short description about this team."
+      },
+      "AUTO_ASSIGN": {
+        "LABEL": "Allow auto assign for this team."
+      },
+      "SUBMIT_CREATE": "Create team"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/webhooks.json b/app/javascript/dashboard/i18n/locale/lv/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json
index 45fcf38cb..f31a987dc 100644
--- a/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json
@@ -1,6 +1,6 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
+    "TITLE": "സംഭാഷണങ്ങൾ തരം തിരിക്കുക",
     "SUBTITLE": "സംഭാഷണങ്ങൾ ഫിൽട്ടർ ചെയ്യുന്നതിന് ചുവടെ ഫിൽട്ടറുകൾ ചേർക്കുക, 'ഫിൽട്ടറുകൾ പ്രയോഗിക്കുക' അമർത്തുക.",
     "ADD_NEW_FILTER": "ഫിൽട്ടർ ചേർക്കുക",
     "FILTER_DELETE_ERROR": "സേവ് ചെയ്യാൻ നിങ്ങൾക്ക് ഒരു ഫിൽട്ടറെങ്കിലും ഉണ്ടായിരിക്കണം",
@@ -8,7 +8,7 @@
     "CANCEL_BUTTON_LABEL": "റദ്ദാക്കുക",
     "CLEAR_BUTTON_LABEL": "ഫിൽട്ടറുകൾ മായ്ക്കുക",
     "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "TOOLTIP_LABEL": "സംഭാഷണങ്ങൾ തരം തിരിക്കുക",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "ഒപ്പം",
       "OR": "അഥവാ"
@@ -19,19 +19,68 @@
       "contains": "അടങ്ങിയിരിക്കുന്നു",
       "does_not_contain": "ഉൾപ്പെട്ടിട്ടില്ല",
       "is_present": "നിലവിലുണ്ട്",
-      "is_not_present": "നിലവിലില്ല"
+      "is_not_present": "നിലവിലില്ല",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "സ്റ്റാറ്റസ്",
       "ASSIGNEE_NAME": "Assignee Name",
       "INBOX_NAME": "ഇൻ‌ബോക്സ് നാമം",
       "TEAM_NAME": "ടീമിന്റെ പേര്",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
+      "CONVERSATION_IDENTIFIER": "സംഭാഷണ ഐഡന്റിഫയർ",
       "CAMPAIGN_NAME": "പ്രചാരണ നാമം",
       "LABELS": "ലേബലുകൾ",
       "BROWSER_LANGUAGE": "ബ്രൗസറിന്റെ ഭാഷ",
       "COUNTRY_NAME": "രാജ്യത്തിന്റെ പേര്",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "റഫറർ ലിങ്ക്",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "നിങ്ങൾക്ക് ഈ ഫിൽട്ടർ സേവ് ചെയ്യണോ?",
+        "LABEL": "ഈ ഫിൽട്ടറിന് പേര് നൽകുക",
+        "PLACEHOLDER": "ഈ ഫിൽട്ടറിന് ഒരു പേര് നൽകുക",
+        "ERROR_MESSAGE": "നാമം ആവശ്യമാണ്",
+        "SAVE_BUTTON": "ഫിൽട്ടർ സേവ് ചെയുക",
+        "CANCEL_BUTTON": "റദ്ദാക്കുക",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "ഫോൾഡർ വിജയകരമായി സൃഷ്ടിച്ചു",
+          "ERROR_MESSAGE": "ഫോൾഡർ സൃഷ്‌ടിക്കുമ്പോൾ പിശക്"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "സെഗ്മെന്റ് വിജയകരമായി സൃഷ്ടിച്ചു",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "ഫിൽട്ടർ ഇല്ലാതാക്കുക",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
+            "MESSAGE": "ഫിൽട്ടർ ഇല്ലാതാക്കുമെന്ന് ഉറപ്പാണോ ",
+            "YES": "അതെ, ഇല്ലാതാക്കുക",
+            "NO": "ഇല്ല, സൂക്ഷിക്കുക"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "ഫോൾഡർ വിജയകരമായി ഇല്ലാതാക്കി",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "സെഗ്‌മെന്റ് വിജയകരമായി ഇല്ലാതാക്കി",
+          "ERROR_MESSAGE": "സെഗ്‌മെന്റ് ഇല്ലാതാക്കുന്നതിൽ പിശക്"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
index 32745a9bf..5c5bbd49a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
@@ -11,18 +11,18 @@
       "FORM": {
         "NAME": {
           "LABEL": "Display Name",
-          "PLACEHOLDER": "Enter custom attribute display name",
+          "PLACEHOLDER": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ട് പ്രദർശന നാമം നൽകുക",
           "ERROR": "നാമം ആവശ്യമാണ്"
         },
         "DESC": {
           "LABEL": "വിവരണം",
           "PLACEHOLDER": "Enter custom attribute description",
-          "ERROR": "Description is required"
+          "ERROR": "വിവരണം ആവശ്യമാണ്"
         },
         "MODEL": {
-          "LABEL": "Applies to",
-          "PLACEHOLDER": "Please select one",
-          "ERROR": "Model is required"
+          "LABEL": "ബാധകമാണ്",
+          "PLACEHOLDER": "ദയവായി തിരഞ്ഞെടുക്കുക",
+          "ERROR": "മോഡൽ ആവശ്യമാണ്"
         },
         "TYPE": {
           "LABEL": "Type",
@@ -30,14 +30,14 @@
           "ERROR": "Type is required",
           "LIST": {
             "LABEL": "List Values",
-            "PLACEHOLDER": "Please enter value and press enter key",
-            "ERROR": "Must have at least one value"
+            "PLACEHOLDER": "ദയവായി മൂല്യം നൽകി എന്റർ കീ അമർത്തുക",
+            "ERROR": "കുറഞ്ഞത് ഒരു മൂല്യമെങ്കിലും ഉണ്ടായിരിക്കണം"
           }
         },
         "KEY": {
           "LABEL": "കീ",
           "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
+          "ERROR": "കീ ആവശ്യമാണ്",
           "IN_VALID": "Invalid key"
         }
       },
@@ -66,11 +66,11 @@
       "TYPE": {
         "LIST": {
           "LABEL": "List Values",
-          "PLACEHOLDER": "Please enter values and press enter key"
+          "PLACEHOLDER": "ദയവായി മൂല്യങ്ങൾ നൽകി എന്റർ കീ അമർത്തുക"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
+        "SUCCESS_MESSAGE": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ട് വിജയകരമായി അപ്‌ഡേറ്റ് ചെയ്‌തു",
         "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
       }
     },
@@ -83,7 +83,7 @@
       "TABLE_HEADER": [
         "പേര്",
         "വിവരണം",
-        "Type",
+        "തരം",
         "കീ"
       ],
       "BUTTONS": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/automation.json b/app/javascript/dashboard/i18n/locale/ml/automation.json
index c3614a990..c801a4f6e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "സൃഷ്ടിക്കുക",
+      "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "നാമം ആവശ്യമാണ്"
+        },
+        "DESC": {
+          "LABEL": "വിവരണം",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "വിവരണം ആവശ്യമാണ്"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "ദയവായി തിരഞ്ഞെടുക്കുക",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "പ്രവർത്തനങ്ങൾ"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "പേര്",
+        "വിവരണം",
+        "സജീവമാണ്",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "ഇല്ലാതാക്കുക",
+      "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
+      "CONFIRM": {
+        "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
+        "MESSAGE": "<p><b>ഏജന്റുമാർ</b></p><p> ഒരു <b>ഏജൻറ്</b> നിങ്ങളുടെ ഉപഭോക്തൃ പിന്തുണാ ടീമിലെ ഒരു അംഗമാണ്. </p><p> ഏജന്റുമാർക്ക് നിങ്ങളുടെ ഉപയോക്താക്കളിൽ നിന്നുള്ള സന്ദേശങ്ങൾ കാണാനും മറുപടി നൽകാനും കഴിയും. നിങ്ങളുടെ അക്കൗണ്ടിലുള്ള എല്ലാ ഏജന്റുമാരെയും ഈ പട്ടിക കാണിക്കുന്നു. </ p> <p> ഒരു പുതിയ ഏജന്റിനെ ചേർക്കുന്നതിന് <b> ഏജന്റിനെ ചേർക്കുക </ b> ബട്ടൺ ക്ലിക്കുചെയ്യുക. നിങ്ങൾ ചേർത്ത ഏജന്റിന് അവരുടെ അക്കൗണ്ട് സജീവമാക്കുന്നതിന് ഒരു സ്ഥിരീകരണ ലിങ്കുള്ള ഇമെയിൽ ലഭിക്കും. അതിനുശേഷം അവർക്ക് ചാറ്റ് വൂട്ട് ആക്സസ് ചെയ്യാനും സന്ദേശങ്ങളോട് പ്രതികരിക്കാനും കഴിയും.</p> <p> ചാറ്റ് വൂട്ടിന്റെ സവിശേഷതകളിലേക്കുള്ള ആക്സസ് ഇനിപ്പറയുന്ന റോളുകളെ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. </p><p> <b>ഏജൻറ്</ b> - ഈ റോൾ‌ ഉള്ള ഏജന്റുമാർ‌ക്ക് ഇൻ‌ബോക്‍സുകൾ‌, റിപ്പോർ‌ട്ടുകൾ‌, സംഭാഷണങ്ങൾ‌ എന്നിവ മാത്രമേ ആക്‌സസ് ചെയ്യാൻ‌ കഴിയൂ. അവർക്ക് മറ്റ് ഏജന്റുമാരുടെയോ അല്ലെങ്കിൽ‌ തങ്ങളുടേയോ സംഭാഷണങ്ങൾ‌ നിർ‌ണ്ണയിക്കാനും സംഭാഷണങ്ങൾ‌ പരിഹരിക്കാനും കഴിയും.</p><p> <b>അഡ്മിനിസ്ട്രേറ്റർ</b> - ഒരു സാധാരണ ഏജന്റിന്റെ പ്രത്യേകാവകാശങ്ങളോടൊപ്പം ക്രമീകരണങ്ങളും ബില്ലിംഗും ഉൾപ്പെടെ നിങ്ങളുടെ അക്കൗണ്ടിൽ ലഭ്യമായ എല്ലാ ചാറ്റ് വൂട്ട് സവിശേഷതകളിലേക്കും ആക്‌സസ് ഉണ്ടായിരിക്കുക. </ p> ",
+        "YES": "അതെ, ഇല്ലാതാക്കുക ",
+        "NO": "ഇല്ല, സൂക്ഷിക്കുക"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "എഡിറ്റുചെയ്യുക",
+      "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "എഡിറ്റുചെയ്യുക",
+      "CREATE": "സൃഷ്ടിക്കുക",
+      "DELETE": "ഇല്ലാതാക്കുക",
+      "CANCEL": "റദ്ദാക്കുക",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/campaign.json b/app/javascript/dashboard/i18n/locale/ml/campaign.json
index 3cfae1066..50a13d788 100644
--- a/app/javascript/dashboard/i18n/locale/ml/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ml/campaign.json
@@ -53,9 +53,9 @@
           "PLACEHOLDER": "ദയവായി സമയം നൽകുക",
           "ERROR": "പേജിൽ സമയം ആവശ്യമാണ്"
         },
-        "ENABLED": "Enable campaign",
+        "ENABLED": "പ്രചാരണം പ്രവർത്തനക്ഷമമാക്കുക",
         "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
-        "SUBMIT": "Add Campaign"
+        "SUBMIT": "പ്രചാരണം ചേർക്കുക"
       },
       "API": {
         "SUCCESS_MESSAGE": "കാമ്പെയ്‌ൻ വിജയകരമായി സൃഷ്‌ടിച്ചു",
@@ -76,16 +76,16 @@
       }
     },
     "EDIT": {
-      "TITLE": "Edit campaign",
+      "TITLE": "പ്രചാരണം എഡിറ്റ് ചെയ്യുക",
       "UPDATE_BUTTON_TEXT": "അപ്‌ഡേറ്റ്",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "SUCCESS_MESSAGE": "കാമ്പെയ്‌ൻ വിജയകരമായി അപ്‌ഡേറ്റ് ചെയ്‌തു",
         "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
       }
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading campaigns...",
-      "404": "There are no campaigns created for this inbox.",
+      "LOADING_MESSAGE": "കാമ്പെയ്‌നുകൾ ലോഡുചെയ്യുന്നു...",
+      "404": "ഈ ഇൻബോക്‌സിനായി കാമ്പെയ്‌നുകളൊന്നും സൃഷ്‌ടിച്ചിട്ടില്ല.",
       "TABLE_HEADER": {
         "TITLE": "തലക്കെട്ട്",
         "MESSAGE": "സന്ദേശം",
@@ -113,14 +113,14 @@
       }
     },
     "ONE_OFF": {
-      "HEADER": "One off campaigns",
-      "404": "There are no one off campaigns created",
+      "HEADER": "ഒരു ഓഫ് കാമ്പെയ്‌നുകൾ",
+      "404": "ആരും ഓഫ് കാമ്പെയ്‌നുകൾ സൃഷ്‌ടിച്ചിട്ടില്ല",
       "INBOXES_NOT_FOUND": "ദയവായി ഒരു എസ്എംഎസ് ഇൻബോക്സ് സൃഷ്ടിച്ച് കാമ്പെയ്‌നുകൾ ചേർക്കാൻ ആരംഭിക്കുക"
     },
     "ONGOING": {
       "HEADER": "നടന്നുകൊണ്ടിരിക്കുന്ന പ്രചാരണങ്ങൾ",
-      "404": "There are no ongoing campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+      "404": "നിലവിലുള്ള പ്രചാരണങ്ങളൊന്നും സൃഷ്ടിച്ചിട്ടില്ല",
+      "INBOXES_NOT_FOUND": "ദയവായി ഒരു വെബ്‌സൈറ്റ് ഇൻബോക്‌സ് സൃഷ്‌ടിച്ച് കാമ്പെയ്‌നുകൾ ചേർക്കാൻ ആരംഭിക്കുക"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json
index d5d29ae96..7005dd7f9 100644
--- a/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "ക്യാൻഡ് പ്രതികരണം ചേർക്കുക",
     "LOADING": "ക്യാൻഡ് പ്രതികരണങ്ങൾ ലഭ്യമാക്കുന്നു",
     "SEARCH_404": "ഈ ചോദ്യവുമായി പൊരുത്തപ്പെടുന്ന ഇനങ്ങളൊന്നുമില്ല",
-    "SIDEBAR_TXT": "<p><b>ക്യാൻഡ് പ്രതികരണങ്ങൾ</b> </p><p> ക്യാൻഡ് പ്രതികരണങ്ങൾ എന്നാൽ മുൻ‌നിശ്ചയിച്ച മറുപടി ടെം‌പ്ലേറ്റുകൾ ആണ്. ഇവ ഒരു സംഭാഷണത്തിന് വേഗത്തിൽ മറുപടി അയയ്‌ക്കാൻ ഉപയോഗിക്കാം. </p><p> ഒരു ക്യാൻഡ് പ്രതികരണം സൃഷ്ടിക്കുന്നതിന് <b>ക്യാൻഡ് പ്രതികരണം ചേർക്കുക</b> എന്നതിൽ ക്ലിക്കുചെയ്യുക. എഡിറ്റുചെയ്യുക അല്ലെങ്കിൽ ഇല്ലാതാക്കുക ബട്ടൺ ക്ലിക്കുചെയ്ത് നിങ്ങൾക്ക് നിലവിലുള്ള ക്യാൻഡ് പ്രതികരണം എഡിറ്റുചെയ്യാനോ ഇല്ലാതാക്കാനോ കഴിയും</p><p> ക്യാൻഡ് പ്രതികരണങ്ങൾ <b> ഹ്രസ്വ കോഡുകളുടെ </b> സഹായത്തോടെ ഉപയോഗിക്കുന്നു. ചാറ്റിൽ ആയിരിക്കുമ്പോൾ ഏജന്റുമാർക്ക് ക്യാൻഡ് പ്രതികരണങ്ങൾ ആക്സസ് ചെയ്യാൻ കഴിയും. ഇതിനായി  <b>'/'</b> എന്ന് ടൈപ്പ് ചെയ്ത ശേഷം ഹ്രസ്വ കോഡ് നൽകുക.</p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "ഈ അക്കൗണ്ടിൽ ക്യാൻഡ് പ്രതികരണങ്ങളൊന്നും ലഭ്യമല്ല.",
       "TITLE": "ക്യാൻഡ് പ്രതികരണങ്ങൾ നിയന്ത്രിക്കുക",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "ക്യാൻഡ് പ്രതികരണം ചേർക്കുക",
-      "DESC": "മുൻ‌നിശ്ചയിച്ച മറുപടി ടെം‌പ്ലേറ്റുകളാണ് ക്യാൻഡ് പ്രതികരണങ്ങൾ‌, അവ സംഭാഷണങ്ങൾക് വേഗത്തിൽ‌ മറുപടികൾ‌ അയയ്‌ക്കാൻ‌ ഉപയോഗിക്കാം.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "ഹ്രസ്വ കോഡ്",
-          "PLACEHOLDER": "ദയവായി ഒരു ഹ്രസ്വ കോഡ് നൽകുക",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "ഹ്രസ്വ കോഡ് ആവശ്യമാണ്"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/chatlist.json b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
index 3f824f6ad..cd16e9a46 100644
--- a/app/javascript/dashboard/i18n/locale/ml/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
@@ -7,7 +7,7 @@
       "404": "ഈ ഗ്രൂപ്പിൽ സജീവ സംഭാഷണങ്ങളൊന്നുമില്ല."
     },
     "TAB_HEADING": "സംഭാഷണങ്ങൾ",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "പരാമർശിക്കുന്നു",
     "SEARCH": {
       "INPUT": "ആളുകൾ, ചാറ്റുകൾ, ക്യാൻഡ് മറുപടികൾ എന്നിവയ്ക്കായി തിരയുക .."
     },
@@ -47,10 +47,10 @@
         "TEXT": "പരിഹരിച്ചത്"
       },
       "pending": {
-        "TEXT": "Pending"
+        "TEXT": "കെട്ടിക്കിടക്കുന്നു"
       },
       "snoozed": {
-        "TEXT": "Snoozed"
+        "TEXT": "സ്‌നൂസ് ചെയ്തു"
       }
     },
     "ATTACHMENTS": {
@@ -79,7 +79,7 @@
     "SENT": "വിജയകരമായി അയച്ചു",
     "NO_MESSAGES": "സന്ദേശങ്ങളൊന്നുമില്ല",
     "NO_CONTENT": "ഉള്ളടക്കമൊന്നും ലഭ്യമല്ല",
-    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "HIDE_QUOTED_TEXT": "ഉദ്ധരിച്ച വാചകം മറയ്ക്കുക",
+    "SHOW_QUOTED_TEXT": "ഉദ്ധരിച്ച വാചകം കാണിക്കുക"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index e917d5ac1..ff99a6ced 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "കമ്പനി",
     "LOCATION": "സ്ഥാനം",
     "CONVERSATION_TITLE": "സംഭാഷണ വിശദാംശങ്ങൾ",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "വ്യക്തിവിവരങ്ങൾ കാണുക",
     "BROWSER": "ബ്രൗസർ",
     "OS": "ഓപ്പറേറ്റിംഗ് സിസ്റ്റം",
     "INITIATED_FROM": "ആരംഭിച്ച ആൾ ",
@@ -63,15 +63,15 @@
     "DESC": "Import contacts through a CSV file.",
     "DOWNLOAD_LABEL": "Download a sample csv.",
     "FORM": {
-      "LABEL": "CSV File",
+      "LABEL": "CSV ഫയൽ",
       "SUBMIT": "Import",
       "CANCEL": "റദ്ദാക്കുക"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "കോൺടാക്റ്റുകൾ വിജയകരമായി സേവ് ചെയ്തിരിക്കുന്നു",
     "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
   },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
+    "BUTTON_LABEL": "കോൺടാക്റ്റ് ഇല്ലാതാക്കുക",
     "TITLE": "കോൺടാക്റ്റ് ഇല്ലാതാക്കുക",
     "DESC": "ബന്ധപ്പെടാനുള്ള വിശദാംശങ്ങൾ ഇല്ലാതാക്കുക",
     "CONFIRM": {
@@ -163,13 +163,14 @@
       },
       "MESSAGE": {
         "LABEL": "സന്ദേശം",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "PLACEHOLDER": "നിങ്ങളുടെ സന്ദേശം ഇവിടെ എഴുതുക",
+        "ERROR": "സന്ദേശം ശൂന്യമാക്കാൻ കഴിയില്ല"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "സന്ദേശം അയയ്ക്കുക",
       "CANCEL": "റദ്ദാക്കുക",
-      "SUCCESS_MESSAGE": "Message sent!",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "SUCCESS_MESSAGE": "സന്ദേശം അയച്ചു!",
+      "GO_TO_CONVERSATION": "കാണുക",
+      "ERROR_MESSAGE": "അയയ്‌ക്കാനായില്ല! വീണ്ടും ശ്രമിക്കുക"
     }
   },
   "CONTACTS_PAGE": {
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "തിരയുക",
     "SEARCH_INPUT_PLACEHOLDER": "കോൺ‌ടാക്റ്റുകൾക്കായി തിരയുക",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "ഫിൽട്ടർ സേവ് ചെയുക",
+    "FILTER_CONTACTS_DELETE": "ഫിൽട്ടർ ഇല്ലാതാക്കുക",
     "LIST": {
       "LOADING_MESSAGE": "കോൺ‌ടാക്റ്റുകൾ‌ ലോഡുചെയ്യുന്നു...",
       "404": "കോൺ‌ടാക്റ്റുകളൊന്നും നിങ്ങളുടെ തിരയലുമായി പൊരുത്തപ്പെടുന്നില്ല",
@@ -186,14 +189,14 @@
         "NAME": "പേര്",
         "PHONE_NUMBER": "ഫോൺ നമ്പർ",
         "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
-        "LAST_ACTIVITY": "Last Activity",
-        "COUNTRY": "Country",
-        "CITY": "City",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "LAST_ACTIVITY": "അവസാന പ്രവർത്തനം",
+        "COUNTRY": "രാജ്യം",
+        "CITY": "നഗരം",
+        "SOCIAL_PROFILES": "സോഷ്യൽ പ്രൊഫൈലുകൾ",
         "COMPANY": "കമ്പനി",
         "EMAIL_ADDRESS": "ഇമെയിൽ വിലാസം"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "വിശദാംശങ്ങൾ കാണുക"
     }
   },
   "CONTACT_PROFILE": {
@@ -202,7 +205,7 @@
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
+      "BUTTON": "ചേർക്കുക",
       "TITLE": "Shift + Enter to create a task"
     },
     "FOOTER": {
@@ -220,17 +223,17 @@
       "LABEL": "added a note"
     },
     "ADD": {
-      "BUTTON": "Add",
+      "BUTTON": "ചേർക്കുക",
       "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "TITLE": "ഒരു കുറിപ്പ് സൃഷ്ടിക്കാൻ Shift + Enter"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "കുറിപ്പ് ഇല്ലാതാക്കുക"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "പ്രവർത്തനങ്ങൾ"
     },
     "BUTTON": {
       "PILL_BUTTON_NOTES": "notes",
diff --git a/app/javascript/dashboard/i18n/locale/ml/contactFilters.json b/app/javascript/dashboard/i18n/locale/ml/contactFilters.json
index 2cd96fdfa..3cf1ea945 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contactFilters.json
@@ -20,15 +20,27 @@
             "contains": "അടങ്ങിയിരിക്കുന്നു",
             "does_not_contain": "ഉൾപ്പെട്ടിട്ടില്ല",
             "is_present": "നിലവിലുണ്ട്",
-            "is_not_present": "നിലവിലില്ല"
+            "is_not_present": "നിലവിലില്ല",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "പേര്",
             "EMAIL": "ഇമെയിൽ",
             "PHONE_NUMBER": "ഫോൺ നമ്പർ",
             "IDENTIFIER": "Identifier",
-            "CITY": "City",
-            "COUNTRY": "Country"
+            "CITY": "നഗരം",
+            "COUNTRY": "രാജ്യം",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index 4c103b7c7..b3021e1ce 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "സംഭാഷണങ്ങൾ ലോഡു ചെയ്യുന്നു",
     "CANNOT_REPLY": "നിങ്ങൾക്ക് മറുപടി നൽകാൻ കഴിയില്ല",
     "24_HOURS_WINDOW": "24 മണിക്കൂർ സന്ദേശ വിൻഡോ നിയന്ത്രണം",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 മണിക്കൂർ സന്ദേശ വിൻഡോ നിയന്ത്രണം",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "അയച്ചത്:",
+    "BOT": "ബോട്ട്",
+    "SEND_FAILED": "സന്ദേശം അയയ്‌ക്കാനായില്ല! വീണ്ടും ശ്രമിക്കുക",
+    "TRY_AGAIN": "വീണ്ടും ശ്രമിക്കുക",
     "ASSIGNMENT": {
       "SELECT_AGENT": "ഏജന്റ് തിരഞ്ഞെടുക്കുക",
       "REMOVE": "നീക്കം ചെയ്യുക",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
@@ -164,7 +169,7 @@
       "ERROR": "Unable to update attribute. Please try again later"
     },
     "ADD": {
-      "TITLE": "Add",
+      "TITLE": "ചേർക്കുക",
       "SUCCESS": "Attribute added successfully",
       "ERROR": "Unable to add attribute. Please try again later"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index acf2657c6..65b482b58 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "ചാനൽ അഭിവാദ്യം പ്രവർത്തനക്ഷമമാക്കുക",
-          "HELP_TEXT": "സംഭാഷണം ആരംഭിക്കുമ്പോൾ ഉപയോക്താവിന് ഒരു അഭിവാദ്യ സന്ദേശം അയയ്‌ക്കുക.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
           "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
+          },
+          "INBOX_NAME": {
+            "LABEL": "ഇൻ‌ബോക്സ് നാമം",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "ഫോൺ നമ്പർ",
+            "PLACEHOLDER": "ദയവായി സന്ദേശം അയയ്‌ക്കുന്ന ഫോൺ നമ്പർ നൽകുക.",
+            "ERROR": "ദയവായി സാധുവായ ഒരു ഫോൺ നമ്പർ നൽകുക. ഫോൺ നമ്പർ `+`ചിഹ്നത്തിൽ ആരംഭിക്കണം."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
         "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
+        "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
+        "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "ഓട്ടോ അസൈൻമെന്റ് പ്രവർത്തനക്ഷമമാക്കുക",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "ഇമെയിൽ വഴി സംഭാഷണ തുടർച്ച പ്രവർത്തനക്ഷമമാക്കുക",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "ബന്ധപ്പെടാനുള്ള ഇമെയിൽ വിലാസം ലഭ്യമാണെങ്കിൽ സംഭാഷണങ്ങൾ ഇമെയിൽ വഴി തുടരും.",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "പുതിയ സംഭാഷണങ്ങളിൽ ലഭ്യമായ ഏജന്റുമാരുടെ ഓട്ടോമാറ്റിക് അസൈൻമെന്റ് പ്രാപ്തമാക്കുകയോ അപ്രാപ്തമാക്കുകയോ ചെയ്യുക",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "സംഭാഷണം പരിഹരിച്ചതിന് ശേഷം സന്ദേശങ്ങൾ അനുവദിക്കുക",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "സംഭാഷണം പരിഹരിച്ചതിന് ശേഷവും സന്ദേശങ്ങൾ അയയ്ക്കാൻ അന്തിമ ഉപയോക്താക്കളെ അനുവദിക്കുക."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "വീണ്ടും അംഗീകാരം നൽകുക",
diff --git a/app/javascript/dashboard/i18n/locale/ml/index.js b/app/javascript/dashboard/i18n/locale/ml/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ml/index.js
+++ b/app/javascript/dashboard/i18n/locale/ml/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index a9a81c11a..d9e87778e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -19,7 +19,7 @@
       },
       "EDIT": {
         "BUTTON_TEXT": "എഡിറ്റുചെയ്യുക",
-        "TITLE": "Edit webhook",
+        "TITLE": "വെബ്ഹുക്ക് എഡിറ്റ് ചെയ്യുക",
         "CANCEL": "റദ്ദാക്കുക",
         "DESC": "നിങ്ങളുടെ ചാറ്റ് വൂട്ട് അക്കൗണ്ടിൽ എന്താണ് സംഭവിക്കുന്നതെന്നതിനെക്കുറിച്ചുള്ള തത്സമയ വിവരങ്ങൾ വെബ്‌ഹൂക്ക് ഇവന്റുകൾ നൽകുന്നു. ഒരു കോൾബാക്ക് കോൺഫിഗർ ചെയ്യുന്നതിന് സാധുവായ ഒരു യുആർഎൽ നൽകുക.",
         "FORM": {
@@ -28,10 +28,10 @@
             "PLACEHOLDER": "ഉദാഹരണം: https://example/api/webhook",
             "ERROR": "ദയവായി സാധുവായ ഒരു യുആർഎൽ നൽകുക"
           },
-          "SUBMIT": "Edit webhook"
+          "SUBMIT": "വെബ്ഹുക്ക് എഡിറ്റ് ചെയ്യുക"
         },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "വെബ്ഹുക്ക് URL വിജയകരമായി അപ്ഡേറ്റ് ചെയ്തിരിക്കുന്നു",
           "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
         }
       },
@@ -68,8 +68,8 @@
     },
     "SLACK": {
       "HELP_TEXT": {
-        "TITLE": "Using Slack Integration",
-        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
+        "TITLE": "സ്ലാക്ക് ഇന്റഗ്രേഷൻ ഉപയോഗിക്കുന്നു",
+        "BODY": "<br/><p>ചാറ്റ്‌വൂട്ട് ഇപ്പോൾ വരുന്ന എല്ലാ സംഭാഷണങ്ങളും <b><i>ഉപഭോക്തൃ-സംഭാഷണങ്ങൾ</i></b> നിങ്ങളുടെ മന്ദഗതിയിലുള്ള ജോലിസ്ഥലത്തെ ചാനലിലേക്ക് സമന്വയിപ്പിക്കും.</p><p>ഒരു മറുപടി നൽകുന്നു. <b><i>ഉപഭോക്തൃ-സംഭാഷണങ്ങൾ</i></b> സ്ലാക്ക് ചാനലിലെ സംഭാഷണ ത്രെഡ്, ചാറ്റ്‌വൂട്ടിലൂടെ ഉപഭോക്താവിന് ഒരു പ്രതികരണം സൃഷ്ടിക്കും.</p><p><b><i> എന്നതിൽ മറുപടികൾ ആരംഭിക്കുക കുറിപ്പ്:</i></b> മറുപടികൾക്ക് പകരം സ്വകാര്യ കുറിപ്പുകൾ സൃഷ്‌ടിക്കുക.</p><p>സ്ലാക്കിലുള്ള റിപ്ലയർക്ക് ചാറ്റ്‌വൂട്ടിൽ ഒരു ഏജന്റ് പ്രൊഫൈൽ ഉണ്ടെങ്കിൽ അതേ ഇമെയിലിന് കീഴിൽ, മറുപടികൾ അതിനനുസരിച്ച് ബന്ധപ്പെടുത്തും.</p><p> p><p>റിപ്ലെയർക്ക് അനുബന്ധ ഏജന്റ് പ്രൊഫൈൽ ഇല്ലെങ്കിൽ, മറുപടികൾ ബോട്ട് പ്രൊഫൈലിൽ നിന്നായിരിക്കും.</p>"
       }
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
index dc9bb3d9c..9faee710a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
@@ -19,9 +19,9 @@
       "NAME": {
         "LABEL": "ലേബൽ നാമം",
         "PLACEHOLDER": "ലേബൽ നാമം",
-        "REQUIRED_ERROR": "Label name is required",
-        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
-        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+        "REQUIRED_ERROR": "ലേബൽ നാമം ആവശ്യമാണ്",
+        "MINIMUM_LENGTH_ERROR": "കുറഞ്ഞ ദൈർഘ്യം 2 ആവശ്യമാണ്",
+        "VALID_ERROR": "അക്ഷരമാല, അക്കങ്ങൾ, ഹൈഫൻ, അണ്ടർ സ്‌കോർ എന്നിവ മാത്രമേ അനുവദിക്കൂ"
       },
       "DESCRIPTION": {
         "LABEL": "വിവരണം",
diff --git a/app/javascript/dashboard/i18n/locale/ml/report.json b/app/javascript/dashboard/i18n/locale/ml/report.json
index f806d3ca9..b387293e5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/report.json
+++ b/app/javascript/dashboard/i18n/locale/ml/report.json
@@ -1,9 +1,9 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "അവലോകനം",
     "LOADING_CHART": "ചാർട്ട് ഡാറ്റ ലോഡു ചെയ്യുകയാണ്...",
     "NO_ENOUGH_DATA": "റിപ്പോർട്ട് സൃഷ്ടിക്കുന്നതിന് ആവശ്യമായ ഡാറ്റ ഞങ്ങൾക്ക് ലഭിച്ചിട്ടില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "DOWNLOAD_AGENT_REPORTS": "ഏജന്റ് റിപ്പോർട്ടുകൾ ഡൗൺലോഡ് ചെയ്യുക",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "സംഭാഷണങ്ങൾ",
@@ -41,31 +41,31 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "കഴിഞ്ഞ 3 മാസം"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "കഴിഞ്ഞ 6 മാസം"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "കഴിഞ്ഞ വർഷം"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "ഇഷ്‌ടാനുസൃത തീയതി ശ്രേണി"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "അപേക്ഷിക്കുക",
+      "PLACEHOLDER": "തീയതി ശ്രേണി തിരഞ്ഞെടുക്കുക"
     }
   },
   "AGENT_REPORTS": {
-    "HEADER": "Agents Overview",
+    "HEADER": "ഏജന്റുമാരുടെ അവലോകനം",
     "LOADING_CHART": "ചാർട്ട് ഡാറ്റ ലോഡു ചെയ്യുകയാണ്...",
     "NO_ENOUGH_DATA": "റിപ്പോർട്ട് സൃഷ്ടിക്കുന്നതിന് ആവശ്യമായ ഡാറ്റ ഞങ്ങൾക്ക് ലഭിച്ചിട്ടില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "DOWNLOAD_AGENT_REPORTS": "ഏജന്റ് റിപ്പോർട്ടുകൾ ഡൗൺലോഡ് ചെയ്യുക",
     "FILTER_DROPDOWN_LABEL": "ഏജന്റ് തിരഞ്ഞെടുക്കുക",
     "METRICS": {
       "CONVERSATIONS": {
@@ -104,32 +104,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "കഴിഞ്ഞ 3 മാസം"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "കഴിഞ്ഞ 6 മാസം"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "കഴിഞ്ഞ വർഷം"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "ഇഷ്‌ടാനുസൃത തീയതി ശ്രേണി"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "അപേക്ഷിക്കുക",
+      "PLACEHOLDER": "തീയതി ശ്രേണി തിരഞ്ഞെടുക്കുക"
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
+    "HEADER": "ലേബലുകൾ അവലോകനം",
     "LOADING_CHART": "ചാർട്ട് ഡാറ്റ ലോഡു ചെയ്യുകയാണ്...",
     "NO_ENOUGH_DATA": "റിപ്പോർട്ട് സൃഷ്ടിക്കുന്നതിന് ആവശ്യമായ ഡാറ്റ ഞങ്ങൾക്ക് ലഭിച്ചിട്ടില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "DOWNLOAD_LABEL_REPORTS": "ലേബൽ റിപ്പോർട്ടുകൾ ഡൗൺലോഡ് ചെയ്യുക",
+    "FILTER_DROPDOWN_LABEL": "ലേബൽ തിരഞ്ഞെടുക്കുക",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "സംഭാഷണങ്ങൾ",
@@ -167,32 +167,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "കഴിഞ്ഞ 3 മാസം"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "കഴിഞ്ഞ 6 മാസം"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "കഴിഞ്ഞ വർഷം"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "ഇഷ്‌ടാനുസൃത തീയതി ശ്രേണി"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "അപേക്ഷിക്കുക",
+      "PLACEHOLDER": "തീയതി ശ്രേണി തിരഞ്ഞെടുക്കുക"
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
+    "HEADER": "ഇൻബോക്സ് അവലോകനം",
     "LOADING_CHART": "ചാർട്ട് ഡാറ്റ ലോഡു ചെയ്യുകയാണ്...",
     "NO_ENOUGH_DATA": "റിപ്പോർട്ട് സൃഷ്ടിക്കുന്നതിന് ആവശ്യമായ ഡാറ്റ ഞങ്ങൾക്ക് ലഭിച്ചിട്ടില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
-    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
-    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "DOWNLOAD_INBOX_REPORTS": "ഇൻബോക്സ് റിപ്പോർട്ടുകൾ ഡൗൺലോഡ് ചെയ്യുക",
+    "FILTER_DROPDOWN_LABEL": "ഇൻബോക്സ് തിരഞ്ഞെടുക്കുക",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "സംഭാഷണങ്ങൾ",
@@ -230,32 +230,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "കഴിഞ്ഞ 3 മാസം"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "കഴിഞ്ഞ 6 മാസം"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "കഴിഞ്ഞ വർഷം"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "ഇഷ്‌ടാനുസൃത തീയതി ശ്രേണി"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "അപേക്ഷിക്കുക",
+      "PLACEHOLDER": "തീയതി ശ്രേണി തിരഞ്ഞെടുക്കുക"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
+    "HEADER": "ടീം അവലോകനം",
     "LOADING_CHART": "ചാർട്ട് ഡാറ്റ ലോഡു ചെയ്യുകയാണ്...",
     "NO_ENOUGH_DATA": "റിപ്പോർട്ട് സൃഷ്ടിക്കുന്നതിന് ആവശ്യമായ ഡാറ്റ ഞങ്ങൾക്ക് ലഭിച്ചിട്ടില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "DOWNLOAD_TEAM_REPORTS": "ടീം റിപ്പോർട്ടുകൾ ഡൗൺലോഡ് ചെയ്യുക",
+    "FILTER_DROPDOWN_LABEL": "ടീം തിരഞ്ഞെടുക്കുക",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "സംഭാഷണങ്ങൾ",
@@ -293,49 +293,49 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "കഴിഞ്ഞ 3 മാസം"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "കഴിഞ്ഞ 6 മാസം"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "കഴിഞ്ഞ വർഷം"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "ഇഷ്‌ടാനുസൃത തീയതി ശ്രേണി"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "അപേക്ഷിക്കുക",
+      "PLACEHOLDER": "തീയതി ശ്രേണി തിരഞ്ഞെടുക്കുക"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "HEADER": "CSAT റിപ്പോർട്ടുകൾ",
+    "NO_RECORDS": "CSAT സർവേ പ്രതികരണങ്ങളൊന്നും ലഭ്യമല്ല.",
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "CONTACT_NAME": "ബന്ധപ്പെടുക",
+        "AGENT_NAME": "നിയോഗിച്ച ഏജന്റ്",
+        "RATING": "റേറ്റിംഗ്",
+        "FEEDBACK_TEXT": "ഫീഡ്ബാക്ക് അഭിപ്രായം"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "ആകെ പ്രതികരണങ്ങൾ",
+        "TOOLTIP": "ശേഖരിച്ച പ്രതികരണങ്ങളുടെ ആകെ എണ്ണം"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "സംതൃപ്തി സ്കോർ",
+        "TOOLTIP": "പോസിറ്റീവ് പ്രതികരണങ്ങളുടെ ആകെ എണ്ണം / പ്രതികരണങ്ങളുടെ ആകെ എണ്ണം * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "പ്രതികരണ നിരക്ക്",
+        "TOOLTIP": "മൊത്തം പ്രതികരണങ്ങളുടെ എണ്ണം / അയച്ച CSAT സർവേ സന്ദേശങ്ങളുടെ ആകെ എണ്ണം * 100"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 55e3866e1..f952d364c 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "പാസ്‌വേഡ്",
+        "LABEL": "പുതിയ പാസ്‌വേഡ്",
         "ERROR": "ദയവായി 6 അല്ലെങ്കിൽ അതിൽ കൂടുതൽ ദൈർഘ്യമുള്ള പാസ്‌വേഡ് നൽകുക",
         "PLACEHOLDER": "ദയവായി ഒരു പുതിയ പാസ്‌വേഡ് നൽകുക"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "പുതിയ പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
         "ERROR": "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല",
-        "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ പാസ്‌വേഡ് വീണ്ടും നൽകുക"
+        "PLACEHOLDER": "നിങ്ങളുടെ പുതിയ പാസ്‌വേഡ് വീണ്ടും നൽകുക"
       }
     }
   },
@@ -136,7 +136,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
     "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "പരാമർശിക്കുന്നു",
     "REPORTS": "റിപ്പോർട്ടുകൾ",
     "SETTINGS": "ക്രമീകരണങ്ങൾ",
     "CONTACTS": "കോൺ‌ടാക്റ്റുകൾ",
@@ -153,12 +153,14 @@
     "CUSTOM_ATTRIBUTES": "ഇഷ്‌ടാനുസൃത ആട്രിബ്യൂട്ടുകൾ",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "ഫോൾഡറുകൾ",
+    "CUSTOM_VIEWS_SEGMENTS": "അംശങ്ങൾ",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_OVERVIEW": "അവലോകനം",
     "CSAT": "CSAT",
     "CAMPAIGNS": "പ്രചാരണങ്ങൾ",
     "ONGOING": "Ongoing",
diff --git a/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
index 5282ccdbb..2f2e884de 100644
--- a/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json
index f2292db8e..f00973f29 100644
--- a/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Custom Attributes"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Cancel",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirm Deletion",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Yes, Delete",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/automation.json b/app/javascript/dashboard/i18n/locale/ne/automation.json
index c3614a990..ee78de7c8 100644
--- a/app/javascript/dashboard/i18n/locale/ne/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Edit",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ne/cannedMgmt.json
index fbcf70ebc..aa24c00f0 100644
--- a/app/javascript/dashboard/i18n/locale/ne/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Add Canned Response",
     "LOADING": "Fetching Canned Responses",
     "SEARCH_404": "There are no items matching this query",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation . </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "There are no canned responses available in this account.",
       "TITLE": "Manage canned responses",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Add Canned Response",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Short Code is required"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index 06c09d796..04c96ccd1 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Cancel",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "View",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ne/contactFilters.json b/app/javascript/dashboard/i18n/locale/ne/contactFilters.json
index 94c5885c1..6c6031cb3 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Name",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Phone number",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 7b31d6d33..1e0a72240 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Loading Conversations",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Remove",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 0d13ee4a3..a04e3d49b 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Phone number",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reauthorize",
diff --git a/app/javascript/dashboard/i18n/locale/ne/index.js b/app/javascript/dashboard/i18n/locale/ne/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ne/index.js
+++ b/app/javascript/dashboard/i18n/locale/ne/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 53de62935..c0b29c849 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Password",
+        "LABEL": "New password",
         "ERROR": "Please enter a password of length 6 or more",
         "PLACEHOLDER": "Please enter a new password"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirm new password",
         "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your password"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
index 44c843815..8edff5699 100644
--- a/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json
index 5edfeeb7a..239741304 100644
--- a/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Labelen",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Aanpasbare attributen"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Annuleren",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Verwijderen bevestigen",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Ja, verwijderen",
+            "NO": "Nee, Bewaar het"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/automation.json b/app/javascript/dashboard/i18n/locale/nl/automation.json
index c3614a990..60b0b3eff 100644
--- a/app/javascript/dashboard/i18n/locale/nl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Aanmaken",
+      "CANCEL_BUTTON_TEXT": "Annuleren",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Beschrijving",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Acties"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Naam",
+        "Beschrijving",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Verwijderen",
+      "CANCEL_BUTTON_TEXT": "Annuleren",
+      "CONFIRM": {
+        "TITLE": "Verwijderen bevestigen",
+        "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
+        "YES": "Ja, verwijderen ",
+        "NO": "Nee, Behouden "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Bewerken",
+      "CANCEL_BUTTON_TEXT": "Annuleren",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Bewerken",
+      "CREATE": "Aanmaken",
+      "DELETE": "Verwijderen",
+      "CANCEL": "Annuleren",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
index 8d482a3fc..c10ba67f5 100644
--- a/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Standaard antwoord toevoegen",
     "LOADING": "Standaard antwoorden ophalen",
     "SEARCH_404": "Er zijn geen items die overeenkomen met deze zoekopdracht",
-    "SIDEBAR_TXT": "<p><b> Standaard antwoorden</b> </p><p> Standaard antwoorden zijn opgeslagen antwoordsjablonen die kunnen worden gebruikt om snel een antwoord te sturen naar een gesprek. </p><p> Voor het maken van een standaard antwoord, klik op de <b>Voeg standaard antwoord toe</b>. U kunt een bestaand antwoord bewerken of verwijderen door op de knop Bewerken of Verwijderen te klikken </p><p> Standaard antwoorden worden gebruikt met behulp van <b>korte codes</b>. Medewerkers hebben toegang tot standaard antwoorden in een chat door <b>'/'</b> te typen gevolgd door de korte code. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Er zijn geen standaard antwoorden beschikbaar in dit account.",
       "TITLE": "Beheer standaard antwoorden",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Standaard antwoord toevoegen",
-      "DESC": "Standaard antwoorden zijn opgeslagen antwoordsjablonen die kunnen worden gebruikt om snel te reageren op gesprek.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Annuleren",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Korte code",
-          "PLACEHOLDER": "Vul een korte code in",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Korte code is vereist"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index a4e609cf9..1b87f00aa 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Annuleren",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Bekijken",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filteren",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/nl/contactFilters.json b/app/javascript/dashboard/i18n/locale/nl/contactFilters.json
index d7b792968..470533142 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Naam",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefoon nummer",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Aanpasbare attributen"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index e2cf77014..d58022b80 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Conversaties laden",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Verwijderen",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 4fc5bacf1..7a64e16c8 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Ingeschakeld",
           "DISABLED": "Uitgeschakeld"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Dit veld is verplicht"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Dit veld is verplicht"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Dit veld is verplicht"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Dit veld is verplicht"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Dit veld is verplicht"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefoon nummer",
+            "PLACEHOLDER": "Voer het telefoonnummer in waaruit het bericht wordt verzonden.",
+            "ERROR": "Voer een geldige waarde in. Telefoonnummer moet beginnen met `+` teken."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Ingeschakeld",
         "DISABLED": "Uitgeschakeld"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Ingeschakeld",
+        "DISABLED": "Uitgeschakeld"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Ingeschakeld",
+        "DISABLED": "Uitgeschakeld"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Automatische toewijzing inschakelen",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Instellingen Postvak In",
       "INBOX_UPDATE_SUB_TEXT": "Update uw inbox instellingen",
       "AUTO_ASSIGNMENT_SUB_TEXT": "In- of uitschakelen van de automatische toewijzing van nieuwe gesprekken aan de agenten die aan deze inbox zijn toegevoegd.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Autoriseer",
diff --git a/app/javascript/dashboard/i18n/locale/nl/index.js b/app/javascript/dashboard/i18n/locale/nl/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/nl/index.js
+++ b/app/javascript/dashboard/i18n/locale/nl/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index d91d80a34..7031aad4e 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Wachtwoord",
+        "LABEL": "New password",
         "ERROR": "Voer een wachtwoord in van 6 of meer",
         "PLACEHOLDER": "Voer een nieuw wachtwoord in"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Bevestig nieuw wachtwoord",
         "ERROR": "Bevestig wachtwoord moet overeenkomen met het wachtwoord",
-        "PLACEHOLDER": "Voer uw wachtwoord opnieuw in"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
index 2d05f0dbe..fda6b51cf 100644
--- a/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/no/advancedFilters.json b/app/javascript/dashboard/i18n/locale/no/advancedFilters.json
index cb7e42f5d..6cfee171d 100644
--- a/app/javascript/dashboard/i18n/locale/no/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/no/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Satus",
@@ -31,7 +33,54 @@
       "LABELS": "Etiketter",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Egendefinerte verdier"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Avbryt",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Bekreft sletting",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Ja, slett",
+            "NO": "Nei, behold den"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/automation.json b/app/javascript/dashboard/i18n/locale/no/automation.json
index c3614a990..0699f72f3 100644
--- a/app/javascript/dashboard/i18n/locale/no/automation.json
+++ b/app/javascript/dashboard/i18n/locale/no/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Opprett",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Beskrivelse",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Handlinger"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Navn",
+        "Beskrivelse",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Slett",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "CONFIRM": {
+        "TITLE": "Bekreft sletting",
+        "MESSAGE": "Er du sikker på at du vil slette ",
+        "YES": "Ja, slett ",
+        "NO": "Nei, behold "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Rediger",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Rediger",
+      "CREATE": "Opprett",
+      "DELETE": "Slett",
+      "CANCEL": "Avbryt",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/no/cannedMgmt.json
index e0b6e9218..7b5c338e7 100644
--- a/app/javascript/dashboard/i18n/locale/no/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Legg til svar",
     "LOADING": "Henter forhåndslagde svar",
     "SEARCH_404": "Det finnes ingen elementer som samsvarer med denne spørringen",
-    "SIDEBAR_TXT": "<p><b>Forhåndslagde svar</b> </p><p> Forhåndslagde svar er forhåndsdefinerte maler som kan bli brukt til å sende ut et raskt svar på en samtale. </p><p> For å lage et forhåndslagd svar, klikk på <b>Legg til svar</b>. Du kan også redigere eller slette et eksisterende forhåndslagd svar ved å klikke på rediger eller slett </p><p> Forhåndslagde svar kan brukes ved hjelp av <b>Korte koder</b>. Agenter kan få tilgang til svar mens de er i en samtale ved å skrive <b>'/'</b> etterfulgt av den korte koden. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Det er ingen forhåndslagde svar tilgjengelig i denne kontoen.",
       "TITLE": "Administrer forhåndslagde svar",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Legg til svar",
-      "DESC": "Forhåndslagde svar er predefinerte maler som kan brukes for å raskt sende ut svar til henvendelser.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Avbryt",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Kort kode",
-          "PLACEHOLDER": "Angi en kort kode",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Kort kode kreves"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 9f667557b..bb2db713c 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Avbryt",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Vis",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Søk",
     "SEARCH_INPUT_PLACEHOLDER": "Søk etter kontakter",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Laster inn kontakter...",
       "404": "Ingen kontakter samsvarer med søket ditt 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/no/contactFilters.json b/app/javascript/dashboard/i18n/locale/no/contactFilters.json
index 272a8b069..7912c5ab0 100644
--- a/app/javascript/dashboard/i18n/locale/no/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/no/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Navn",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefonnummer",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Egendefinerte verdier"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 94374721a..7c16e1bf6 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Laster samtaler",
     "CANNOT_REPLY": "Du kan ikke svare på grunn av",
     "24_HOURS_WINDOW": "24-timers meldingsrestriksjon",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24-timers meldingsrestriksjon",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sendt av:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Velg agent",
       "REMOVE": "Fjern",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index 8cb6aadce..a590230fa 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Antall dager en sak skal løses automatisk hvis det ikke har vært aktivitet",
         "PLACEHOLDER": "30",
-        "ERROR": "Angi en gyldig varighet for når en sak skal løses automatisk (minimum 1 dag)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Samtalekontinuitet med e-post er aktivert for din konto.",
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 668743647..5cc3e12f3 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Aktiver kanalhilsen",
-          "HELP_TEXT": "Send en velkomstmelding til brukeren når hen starter samtalen.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Aktivert",
           "DISABLED": "Deaktivert"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Dette feltet er obligatorisk"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Dette feltet er obligatorisk"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Dette feltet er obligatorisk"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Dette feltet er obligatorisk"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Navn på innboks",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Dette feltet er obligatorisk"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefonnummer",
+            "PLACEHOLDER": "Vennligst angi telefonnummeret som meldinger skal sendes fra.",
+            "ERROR": "Skriv inn en gyldig verdi. Telefonnummeret skal starte med `+`-tegn."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Aktivert",
         "DISABLED": "Deaktivert"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Aktivert",
+        "DISABLED": "Deaktivert"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Aktivert",
+        "DISABLED": "Deaktivert"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Aktiver autotilordning",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Innboksinnstillinger",
       "INBOX_UPDATE_SUB_TEXT": "Oppdater innboksinnstillinger",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktiver eller deaktiver automatisk tildeling av nye samtaler til agenter som er lagt til i denne innboksen.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Begynn å videresende e-post til følgende e-postadresse."
+      "FORWARD_EMAIL_SUB_TEXT": "Begynn å videresende e-post til følgende e-postadresse.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautoriser",
diff --git a/app/javascript/dashboard/i18n/locale/no/index.js b/app/javascript/dashboard/i18n/locale/no/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/no/index.js
+++ b/app/javascript/dashboard/i18n/locale/no/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 2cfaeac13..afebcd787 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Passord",
+        "LABEL": "New password",
         "ERROR": "Skriv inn et passord som er 6 eller flere tegn langt",
         "PLACEHOLDER": "Vennligst angi et nytt passord"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Bekreft nytt passord",
         "ERROR": "Det bekreftende passordet burde samsvare med passordet",
-        "PLACEHOLDER": "Oppgi ditt passord på nytt"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Egendefinerte verdier",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/no/teamsSettings.json b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
index 3469147dd..da9ec47b3 100644
--- a/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
index 4aacb1e5d..e7d2e5cb6 100644
--- a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
@@ -1,17 +1,17 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
+    "TITLE": "Filtruj rozmowy",
+    "SUBTITLE": "Dodaj poniższe filtry i kliknij 'Zastosuj filtry', aby przefiltrować rozmowy.",
     "ADD_NEW_FILTER": "Add Filter",
     "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
     "SUBMIT_BUTTON_LABEL": "Apply filters",
     "CANCEL_BUTTON_LABEL": "Anuluj",
     "CLEAR_BUTTON_LABEL": "Clear Filters",
     "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "TOOLTIP_LABEL": "Filtruj konwersacje",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "i",
+      "OR": "albo"
     },
     "OPERATOR_LABELS": {
       "equal_to": "Equal to",
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -28,10 +30,57 @@
       "TEAM_NAME": "Team Name",
       "CONVERSATION_IDENTIFIER": "Conversation Identifier",
       "CAMPAIGN_NAME": "Campaign Name",
-      "LABELS": "Labels",
+      "LABELS": "Etykiety",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Anuluj",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Potwierdź usunięcie",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Tak, usuń",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
index 2d9c8ff84..1145aacef 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
@@ -95,7 +95,7 @@
     "MULTI_SELECTOR": {
       "PLACEHOLDER": "Brak",
       "TITLE": {
-        "AGENT": "Wybierz konsultanta",
+        "AGENT": "Wybierz agenta",
         "TEAM": "Wybierz zespół"
       },
       "SEARCH": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
index 9b392279b..e5c55a561 100644
--- a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
@@ -15,7 +15,7 @@
           "ERROR": "Name is required"
         },
         "DESC": {
-          "LABEL": "Description",
+          "LABEL": "Opis",
           "PLACEHOLDER": "Enter custom attribute description",
           "ERROR": "Description is required"
         },
@@ -82,7 +82,7 @@
     "LIST": {
       "TABLE_HEADER": [
         "Nazwa",
-        "Description",
+        "Opis",
         "Type",
         "Key"
       ],
diff --git a/app/javascript/dashboard/i18n/locale/pl/automation.json b/app/javascript/dashboard/i18n/locale/pl/automation.json
index c3614a990..48fed5ea7 100644
--- a/app/javascript/dashboard/i18n/locale/pl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Stwórz",
+      "CANCEL_BUTTON_TEXT": "Anuluj",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Opis",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Akcje"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nazwa",
+        "Opis",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Usuń",
+      "CANCEL_BUTTON_TEXT": "Anuluj",
+      "CONFIRM": {
+        "TITLE": "Potwierdź usunięcie",
+        "MESSAGE": "Czy na pewno chcesz usunąć ",
+        "YES": "Tak, usuń ",
+        "NO": "Nie, zachowaj "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Edytuj",
+      "CANCEL_BUTTON_TEXT": "Anuluj",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Edytuj",
+      "CREATE": "Stwórz",
+      "DELETE": "Usuń",
+      "CANCEL": "Anuluj",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
index 726ee2528..7881ae8e8 100644
--- a/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Dodaj przygotowaną odpowiedź",
     "LOADING": "Pobieranie przygotowanych odpowiedzi",
     "SEARCH_404": "Brak elementów pasujących do tego zapytania",
-    "SIDEBAR_TXT": "<p><b>Gotowe odpowiedzi</b> </p><p> Gotowe odpowiedzi to zapisane szablony odpowiedzi, które mogą być użyte do szybkiego wysłania odpowiedzi do rozmowy. </p><p> Aby utworzyć Gotową odpowiedź, wystarczy kliknąć <b>Dodaj Gotową Odpowiedź</b>. Możesz również edytować lub usuwać istniejącą gotową odpowiedź, klikając przycisk Edytuj lub Usuń </p><p> Gotowe odpowiedzi są używane z pomocą <b>Krótkie kody</b>. Agenci mogą uzyskać dostęp do gotowych odpowiedzi podczas czatu, wpisując <b>'/'</b> , a następnie krótki kod. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Brak gotowych odpowiedzi dostępnych na tym koncie.",
       "TITLE": "Zarządzaj gotowymi odpowiedziami",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Dodaj Gotową odpowiedź",
-      "DESC": "Gotowe odpowiedzi są zapisanymi szablonami odpowiedzi, które mogą być użyte do szybkiego wysyłania odpowiedzi do konwersacji.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krótki kod",
-          "PLACEHOLDER": "Wprowadź krótki kod",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Krótki kod jest wymagany"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index 524590bf2..e1bb7f83c 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -41,16 +41,16 @@
     ],
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
-        "TEXT": "Otwórz"
+        "TEXT": "Otwarte"
       },
       "resolved": {
-        "TEXT": "Rozwiązano"
+        "TEXT": "Rozwiązane"
       },
       "pending": {
         "TEXT": "Oczekujące"
       },
       "snoozed": {
-        "TEXT": "Odłożone"
+        "TEXT": "Uśpione"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index c6197f0bb..247ac28bd 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -77,13 +77,13 @@
     "CONFIRM": {
       "TITLE": "Potwierdź usunięcie",
       "MESSAGE": "Czy na pewno chcesz usunąć ",
-      "PLACE_HOLDER": "Please type {contactName} to confirm",
+      "PLACE_HOLDER": "Wpisz {contactName} aby potwierdzić",
       "YES": "Tak, usuń ",
       "NO": "Nie, zachowaj "
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "Kontakt został usunięty pomyślnie",
+      "ERROR_MESSAGE": "Nie można usunąć kontaktu. Spróbuj ponownie później."
     }
   },
   "CONTACT_FORM": {
@@ -111,7 +111,7 @@
         "LABEL": "Numer telefonu",
         "HELP": "Numer telefonu powinien mieć format E.164, np. +1415555555 [+][kod krajowy][kod kierunkowy][numer telefonu]",
         "ERROR": "Numer telefonu powinien być pusty lub w formacie E.164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "Ten numer telefonu jest już zajęty przez inny kontakt."
       },
       "LOCATION": {
         "PLACEHOLDER": "Wprowadź lokalizację kontaktu",
@@ -157,9 +157,9 @@
         "ERROR": "Wybierz skrzynkę odbiorczą"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "Temat",
+        "PLACEHOLDER": "Temat",
+        "ERROR": "Temat nie może być pusty"
       },
       "MESSAGE": {
         "LABEL": "Wiadomość",
@@ -169,6 +169,7 @@
       "SUBMIT": "Wyślij wiadomość",
       "CANCEL": "Anuluj",
       "SUCCESS_MESSAGE": "Wiadomość wysłana!",
+      "GO_TO_CONVERSATION": "Widok",
       "ERROR_MESSAGE": "Nie udało się wysłać! Spróbuj ponownie"
     }
   },
@@ -177,7 +178,9 @@
     "FIELDS": "Pola kontaktu",
     "SEARCH_BUTTON": "Szukaj",
     "SEARCH_INPUT_PLACEHOLDER": "Szukaj kontaktów",
-    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS": "Filtruj",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Ładowanie kontaktów...",
       "404": "Brak kontaktów pasujących do Twojego wyszukiwania 🔍",
@@ -198,7 +201,7 @@
   },
   "CONTACT_PROFILE": {
     "BACK_BUTTON": "Kontakty",
-    "LOADING": "Loading contact profile..."
+    "LOADING": "Wczytywanie profilu kontaktu..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
@@ -211,13 +214,13 @@
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "Pobieranie notatek...",
+    "NOT_AVAILABLE": "Nie ma żadnych notatek dla tego kontaktu",
     "HEADER": {
       "TITLE": "Notatki"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "dodano notatkę"
     },
     "ADD": {
       "BUTTON": "Dodaj",
@@ -225,7 +228,7 @@
       "TITLE": "Shift + Enter by utworzyć notatkę"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Usuń notatkę"
     }
   },
   "EVENTS": {
@@ -239,7 +242,7 @@
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
+    "ADD_BUTTON_TEXT": "Dodaj atrybuty",
     "BUTTON": "Dodaj niestandardowy atrybut",
     "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
     "COPY_SUCCESSFUL": "Pomyślnie skopiowano do schowka",
@@ -278,7 +281,7 @@
         "ERROR": "Unable to delete attribute. Please try again later"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
+        "TITLE": "Dodaj atrybuty",
         "PLACEHOLDER": "Search attributes",
         "NO_RESULT": "No attributes found"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
index 22da37790..f59f7a245 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
@@ -11,8 +11,8 @@
         "EMPTY_VALUE_ERROR": "Value is required",
         "TOOLTIP_LABEL": "Filter contacts",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "i",
+            "OR": "albo"
         },
         "OPERATOR_LABELS": {
             "equal_to": "Equal to",
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nazwa",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Numer telefonu",
             "IDENTIFIER": "Identifier",
             "CITY": "Miasto",
-            "COUNTRY": "Kraj"
+            "COUNTRY": "Kraj",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Dodatkowe filtry",
+            "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index e50517003..a5dbacd31 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -10,7 +10,7 @@
     "SEARCH_MESSAGES": "Szukaj wiadomości w konwersacjach",
     "SEARCH": {
       "TITLE": "Szukaj wiadomości",
-      "RESULT_TITLE": "Search Results",
+      "RESULT_TITLE": "Wyniki wyszukiwania",
       "LOADING_MESSAGE": "Trwa przetwarzanie danych...",
       "PLACEHOLDER": "Wpisz dowolny tekst, aby wyszukać wiadomości",
       "NO_MATCHING_RESULTS": "Brak wyników."
@@ -22,15 +22,17 @@
     "LOADING_CONVERSATIONS": "Ładowanie konwersacji",
     "CANNOT_REPLY": "Nie możesz odpowiedzieć z powodu",
     "24_HOURS_WINDOW": "Ograniczenie 24-godzinnego okna wiadomości",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "Możesz odpowiedzieć na tę rozmowę tylko za pomocą szablonu wiadomości, ponieważ",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Ograniczenie 24-godzinnego okna wiadomości",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "SELECT_A_TWEET_TO_REPLY": "Wybierz tweeta, na który chcesz odpowiedzieć.",
     "REPLYING_TO": "Osoba, której odpowiadasz to:",
     "REMOVE_SELECTION": "Usuń zaznaczenie",
     "DOWNLOAD": "Pobierz",
     "UPLOADING_ATTACHMENTS": "Przesyłanie załączników...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "SUCCESS_DELETE_MESSAGE": "Wiadomość usunięta pomyślnie",
+    "FAIL_DELETE_MESSSAGE": "Nie można usunąć wiadomości! Spróbuj ponownie",
     "NO_RESPONSE": "Brak odpowiedzi",
     "RATING_TITLE": "Rating",
     "FEEDBACK_TITLE": "Feedback",
@@ -48,10 +50,10 @@
     "RESOLVE_DROPDOWN": {
       "MARK_PENDING": "Oznacz jako oczekujące",
       "SNOOZE": {
-        "TITLE": "Snooze until",
-        "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "TITLE": "Uśpij do",
+        "NEXT_REPLY": "Następna odpowiedź",
+        "TOMORROW": "Jutro",
+        "NEXT_WEEK": "Następny tydzień"
       }
     },
     "FOOTER": {
@@ -73,12 +75,12 @@
         "ADD_BCC": "Add bcc",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
+          "PLACEHOLDER": "E-maile oddzielone przecinkami",
           "ERROR": "Please enter valid email addresses"
         },
         "BCC": {
           "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
+          "PLACEHOLDER": "E-maile oddzielone przecinkami",
           "ERROR": "Please enter valid email addresses"
         }
       }
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Wysłane przez:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Wybierz Agenta",
       "REMOVE": "Usuń",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Zaproś członków swojego zespołu",
-      "DESCRIPTION": "Ponieważ jesteś gotów porozmawiać ze swoim klientem, przynieś swoich kolegów z drużyny, aby Ci pomóc. Możesz zaprosić znajomych z drużyny, dodając ich adres e-mail do listy agentów.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Kliknij tutaj, aby zaprosić członka zespołu"
     },
     "INBOXES": {
@@ -173,7 +178,7 @@
       "ERROR": "Unable to delete attribute. Please try again later"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
+      "TITLE": "Dodaj atrybuty",
       "PLACEHOLDER": "Search attributes",
       "NO_RESULT": "No attributes found"
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json b/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json
index d7d2efc2a..69ee101bb 100644
--- a/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/csatMgmt.json
@@ -1,6 +1,6 @@
 {
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Oceń udzielone Ci wsparcie",
+    "PLACEHOLDER": "Dodaj swój komentarz..."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index 3bdd5ee4a..b2b8de2de 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Liczba dni, po upływie których, zgłoszenie powinno zostać automatycznie rozwiązane z powodu braku aktywności",
         "PLACEHOLDER": "30",
-        "ERROR": "Wprowadź prawidłowy czas automatycznego rozwiązywania (minimum 1 dzień)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Kontynuacja rozmów za pomocą wiadomości e-mail jest włączona dla Twojego konta.",
@@ -123,9 +123,9 @@
       "RESOLVE_CONVERSATION": "Resolve conversation",
       "SEND_TRANSCRIPT": "Send an email transcript",
       "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow"
+      "UNTIL_NEXT_REPLY": "Do następnej odpowiedzi",
+      "UNTIL_NEXT_WEEK": "Do następnego tygodnia",
+      "UNTIL_TOMORROW": "Do jutra"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 721a0b4e3..a1eecbc3e 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Włącz powitanie dla kanału",
-          "HELP_TEXT": "Wyślij wiadomość powitalną użytkownikowi, gdy rozpocznie rozmowę.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Włączone",
           "DISABLED": "Wyłączone"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "To pole jest wymagane"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "To pole jest wymagane"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "To pole jest wymagane"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "To pole jest wymagane"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nazwa skrzynki odbiorczej",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "To pole jest wymagane"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Numer telefonu",
+            "PLACEHOLDER": "Wprowadź numer telefonu, z którego zostanie wysłana wiadomość.",
+            "ERROR": "Wprowadź prawidłową wartość. Numer telefonu powinien zaczynać się od znaku `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Włączone",
         "DISABLED": "Wyłączone"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Włączone",
+        "DISABLED": "Wyłączone"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Włączone",
+        "DISABLED": "Wyłączone"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -349,8 +405,10 @@
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Włącz automatyczne przypisanie",
-      "ENABLE_CSAT": "Enable CSAT",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CSAT": "Włącz CSAT",
+      "ENABLE_CSAT_SUB_TEXT": "Włącz/Wyłącz ankietę CSAT(Customer satisfraction) po rozwiązaniu rozmowy",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Włącz ciągłość rozmowy przez e-mail",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Ustawienia skrzynki odbiorczej",
       "INBOX_UPDATE_SUB_TEXT": "Zaktualizuj ustawienia skrzynki odbiorczej",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Włącz lub wyłącz automatyczne przypisywanie nowych rozmów do agentów dodanych do tej skrzynki odbiorczej.",
@@ -360,8 +418,10 @@
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Zacznij przekierowywać swoje wiadomości na następujący adres e-mail."
+      "FORWARD_EMAIL_TITLE": "Przekaż do wiadomości e-mail",
+      "FORWARD_EMAIL_SUB_TEXT": "Zacznij przekierowywać swoje wiadomości na następujący adres e-mail.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Ponowna autoryzacja",
@@ -387,7 +447,7 @@
       }
     },
     "BUSINESS_HOURS": {
-      "TITLE": "Set your availability",
+      "TITLE": "Ustaw swoją dostępność",
       "SUBTITLE": "Set your availability on your livechat widget",
       "WEEKLY_TITLE": "Ustaw swoje godziny tygodniowe",
       "TIMEZONE_LABEL": "Wybierz strefę czasową",
diff --git a/app/javascript/dashboard/i18n/locale/pl/index.js b/app/javascript/dashboard/i18n/locale/pl/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/pl/index.js
+++ b/app/javascript/dashboard/i18n/locale/pl/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
index 06defe051..47ac417f4 100644
--- a/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
@@ -1,34 +1,34 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Labels",
-    "HEADER_BTN_TXT": "Add label",
+    "HEADER": "Etykiety",
+    "HEADER_BTN_TXT": "Dodaj etykietę",
     "LOADING": "Fetching labels",
     "SEARCH_404": "Brak elementów pasujących do tego zapytania",
     "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
     "LIST": {
       "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "Zarządzaj etykietami",
+      "DESC": "Etykiety pozwalają na grupowanie rozmów razem.",
       "TABLE_HEADER": [
         "Nazwisko",
-        "Description",
-        "Color"
+        "Opis",
+        "Kolor"
       ]
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Label Name",
+        "LABEL": "Nazwa etykiety",
         "PLACEHOLDER": "Label name",
         "REQUIRED_ERROR": "Label name is required",
         "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
         "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
+        "LABEL": "Opis",
         "PLACEHOLDER": "Label Description"
       },
       "COLOR": {
-        "LABEL": "Color"
+        "LABEL": "Kolor"
       },
       "SHOW_ON_SIDEBAR": {
         "LABEL": "Show label on sidebar"
@@ -39,8 +39,8 @@
       "CANCEL": "Anuluj"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "Dodaj etykietę",
+      "DESC": "Etykiety pozwalają na grupowanie rozmów razem.",
       "API": {
         "SUCCESS_MESSAGE": "Label added successfully",
         "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
@@ -49,14 +49,14 @@
     "EDIT": {
       "TITLE": "Edit label",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
+        "SUCCESS_MESSAGE": "Etykieta została pomyślnie zaktualizowana",
         "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "SUCCESS_MESSAGE": "Etykieta została usunięta",
         "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
       },
       "CONFIRM": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index 711c36a14..6af27e9d2 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -320,22 +320,22 @@
       "HEADER": {
         "CONTACT_NAME": "Contact",
         "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "RATING": "Ocena",
+        "FEEDBACK_TEXT": "Komentarz do opinii"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "Łącznie odpowiedzi",
+        "TOOLTIP": "Całkowita liczba zebranych odpowiedzi"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "Poziom zadowolenia",
+        "TOOLTIP": "Całkowita liczba pozytywnych odpowiedzi / Całkowita liczba odpowiedzi * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "Wskaźnik odpowiedzi",
+        "TOOLTIP": "Całkowita liczba odpowiedzi / całkowita liczba wysłanych komunikatów z ankiety CSAT * 100"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index f44f73a03..e517032f3 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Hasło",
+        "LABEL": "New password",
         "ERROR": "Wprowadź hasło o długości 6 lub więcej",
         "PLACEHOLDER": "Wprowadź nowe hasło"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Potwierdź nowe hasło",
         "ERROR": "Potwierdź hasło powinno być zgodne z hasłem",
-        "PLACEHOLDER": "Wprowadź ponownie hasło"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -149,10 +149,12 @@
     "PROFILE_SETTINGS": "Ustawienia profilu",
     "ACCOUNT_SETTINGS": "Account Settings",
     "APPLICATIONS": "Applications",
-    "LABELS": "Labels",
+    "LABELS": "Etykiety",
     "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty",
     "AUTOMATION": "Automation",
     "TEAMS": "Zespoły",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
@@ -164,7 +166,7 @@
     "ONGOING": "Ongoing",
     "ONE_OFF": "One off",
     "REPORTS_AGENT": "Agenci",
-    "REPORTS_LABEL": "Labels",
+    "REPORTS_LABEL": "Etykiety",
     "REPORTS_INBOX": "Skrzynka odbiorcza",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as"
diff --git a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
index dee797815..3aebdc355 100644
--- a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Utwórz nowy zespół",
     "HEADER": "Zespoły",
-    "SIDEBAR_TXT": "<p><b>Zespoły</b></p> <p>pozwalają Ci zorganizować swoich agentów w grupy w oparciu o ich obowiązki. <br /> Użytkownik może być częścią wielu zespołów. Możesz przypisać rozmowy do zespołu, gdy pracujesz wspólnie. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "Na tym koncie nie ma żadnych zespołów.",
       "EDIT_TEAM": "Edytuj zespół"
@@ -117,7 +117,7 @@
         "PLACEHOLDER": "Short description about this team."
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Allow auto assign for this team."
+        "LABEL": "Zezwalaj na automatyczne przypisywanie dla tego zespołu."
       },
       "SUBMIT_CREATE": "Utwórz zespół"
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
index ec927194d..2d75cfdee 100644
--- a/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "SItuação",
@@ -31,7 +33,54 @@
       "LABELS": "Etiquetas",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Atributos personalizados"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "cancelar",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirmar Exclusão",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Sim, excluir",
+            "NO": "Não, mantenha isso"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/automation.json b/app/javascript/dashboard/i18n/locale/pt/automation.json
index c3614a990..d04ac00c2 100644
--- a/app/javascript/dashboard/i18n/locale/pt/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Criar",
+      "CANCEL_BUTTON_TEXT": "cancelar",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Descrição",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Ações."
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nome:",
+        "Descrição",
+        "Ativa",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "excluir",
+      "CANCEL_BUTTON_TEXT": "cancelar",
+      "CONFIRM": {
+        "TITLE": "Confirmar Exclusão",
+        "MESSAGE": "Tem certeza que deseja excluir ",
+        "YES": "Sim, excluir ",
+        "NO": "Não, Manter "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Alterar",
+      "CANCEL_BUTTON_TEXT": "cancelar",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Alterar",
+      "CREATE": "Criar",
+      "DELETE": "excluir",
+      "CANCEL": "cancelar",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json
index 54ce9bbea..13fac0e98 100644
--- a/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Adicionar resposta pronta",
     "LOADING": "Buscando respostas prontas",
     "SEARCH_404": "Não existem itens correspondentes a esta consulta",
-    "SIDEBAR_TXT": "<p><b>Respostas Prontas</b> </p><p> Respostas Prontas são templates de resposta salvos, que podem ser usados para enviar rapidamente uma resposta para uma conversa. </p><p> Para criar uma Resposta Pronta, clique no <b>Adicionar Resposta Pronta</b>. Você também pode editar ou excluir uma resposta existente clicando no botão Editar ou Excluir </p><p> respostas prontas são usadas com a ajuda de <b>Código Curto</b>. Os agentes podem acessar as respostas prontas enquanto estiverem em um chat digitando <b>'/'</b> seguido pelo pequeno código. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Não há respostas prontas disponíveis nesta conta.",
       "TITLE": "Gerenciar respostas prontas",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Adicionar resposta pronta",
-      "DESC": "Respostas prontas são salvas nos modelos de resposta que podem ser usados para enviar rapidamente uma resposta para a conversa.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "cancelar",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Código curto",
-          "PLACEHOLDER": "Insira o shortcode",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "É necessário um código curto"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 3507f9868..01d33203a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Enviar mensagem",
       "CANCEL": "cancelar",
       "SUCCESS_MESSAGE": "Mensagem enviada!",
+      "GO_TO_CONVERSATION": "Visualizar",
       "ERROR_MESSAGE": "Não foi possível enviar! Tente novamente"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Procurar",
     "SEARCH_INPUT_PLACEHOLDER": "Procurar por contatos",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "A carregar contatos...",
       "404": "Nenhum contato corresponde à sua pesquisa 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contactFilters.json b/app/javascript/dashboard/i18n/locale/pt/contactFilters.json
index 64574deb5..2d009a8cc 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nome:",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Número de telefone",
             "IDENTIFIER": "Identifier",
             "CITY": "Cidade",
-            "COUNTRY": "País"
+            "COUNTRY": "País",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Atributos personalizados"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 2dc5e67e2..01a4aead1 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Carregando conversas",
     "CANNOT_REPLY": "Não pode responder porque",
     "24_HOURS_WINDOW": "Mensagens bloqueadas durante 24 horas",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Atribuir a mim",
     "TWILIO_WHATSAPP_CAN_REPLY": "Só pode responder, utilizando uma mensagem modelo, porque",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Mensagens bloqueadas durante 24 horas",
     "SELECT_A_TWEET_TO_REPLY": "Para responder escolha por favor um tweet.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "O ficheiro ultrapassa o tamanho limite {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Enviado por:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Escolher Agente",
       "REMOVE": "Excluir",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Convidar os membros da sua equipa",
-      "DESCRIPTION": "Já que se prepara para começar a conversar com o seu cliente, convide também os seus colegas para o ajudar. Pode adicionar colegas de equipa acrescentando o seu endereço de e-mail na lista de agentes.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Clique aqui para convidar um membro para a equipa"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index d7e3a9d16..50a32032d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Número de dias sem nenhuma atividade, após os quais, o ticket se auto-resolve",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor, escolha um período para auto-resolução válido (mínimo de 1 dia)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A sua conta tem a opção de continuar as conversas por e-mail ativada.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index f570d6c4e..f2cf97471 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Ativar mensagem de Boas-vindas do canal",
-          "HELP_TEXT": "Enviar uma mensagem de boas-vindas ao utilizador quando ele iniciar uma conversa.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Ativado",
           "DISABLED": "Desabilitado"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "Canal SMS através do Twilio",
-        "DESC": "Comece a dar apoio aos seus clientes por SMS com a integração Twilio."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nome Caixa de Entrada",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Número de telefone",
+            "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
+            "ERROR": "Por favor, insira um valor válido. O número de telefone deve começar com o sinal `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Link de retorno de ligação",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Ativado",
         "DISABLED": "Desabilitado"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Ativado",
+        "DISABLED": "Desabilitado"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Ativado",
+        "DISABLED": "Desabilitado"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Habilitar atribuição automática",
       "ENABLE_CSAT": "Ativar CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Ativar/Desativar avaliação CSAT (satisfação do cliente) depois de resolver uma conversa",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Configurações da Caixa de Entrada",
       "INBOX_UPDATE_SUB_TEXT": "Atualize suas configurações da caixa de entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ativar ou desativar a atribuição automática de novas conversas aos agentes adicionados a essa caixa de entrada.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Comece a encaminhar as suas mensagens de email para o seguinte endereço."
+      "FORWARD_EMAIL_SUB_TEXT": "Comece a encaminhar as suas mensagens de email para o seguinte endereço.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautorizar",
diff --git a/app/javascript/dashboard/i18n/locale/pt/index.js b/app/javascript/dashboard/i18n/locale/pt/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/pt/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index f804b376d..5e3186761 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Por favor, digite a password atual"
       },
       "PASSWORD": {
-        "LABEL": "Palavra-passe",
+        "LABEL": "New password",
         "ERROR": "Por favor, digite uma senha de comprimento 6 ou mais",
         "PLACEHOLDER": "Por favor, digite uma nova senha"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirme a nova senha",
         "ERROR": "Confirme a senha deve corresponder à senha",
-        "PLACEHOLDER": "Por favor, digite sua senha novamente"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Atributos personalizados",
     "AUTOMATION": "Automation",
     "TEAMS": "Equipas",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Todos os contatos",
     "TAGGED_WITH": "Etiquetada com",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
index e229bd44e..437adba27 100644
--- a/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Criar nova equipa",
     "HEADER": "Equipas",
-    "SIDEBAR_TXT": "<p><b>Equipas</b></p> <p>As equipas permitem-lhe organizar os seus agentes em grupos com base nas suas responsabilidades. <br /> Um utilizador pode fazer parte de várias equipas. Pode atribuir conversas a uma equipa quando estiver a trabalhar online. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "Não há equipas configuradas para esta conta.",
       "EDIT_TEAM": "Editar equipa"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
index 0b46ea7c2..67c927746 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contém",
       "does_not_contain": "Não contém",
       "is_present": "Está presente",
-      "is_not_present": "Não está presente"
+      "is_not_present": "Não está presente",
+      "is_greater_than": "É maior que",
+      "is_lesser_than": "É menor que"
     },
     "ATTRIBUTES": {
       "STATUS": "SItuação",
@@ -31,7 +33,54 @@
       "LABELS": "Marcadores",
       "BROWSER_LANGUAGE": "Idioma do navegador",
       "COUNTRY_NAME": "Nome do País",
-      "REFERER_LINK": "Link de referência"
+      "REFERER_LINK": "Link de referência",
+      "CUSTOM_ATTRIBUTE_LIST": "Lista",
+      "CUSTOM_ATTRIBUTE_TEXT": "Texto",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Número",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Filtros Padrão",
+      "ADDITIONAL_FILTERS": "Filtros adicionais",
+      "CUSTOM_ATTRIBUTES": "Atributos Personalizados"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Você quer salvar este filtro?",
+        "LABEL": "Nomear este filtro",
+        "PLACEHOLDER": "Digite um nome para este filtro",
+        "ERROR_MESSAGE": "O nome é obrigatório",
+        "SAVE_BUTTON": "Salvar Filtro",
+        "CANCEL_BUTTON": "Cancelar",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Pasta criada com sucesso",
+          "ERROR_MESSAGE": "Erro ao criar pasta"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segmento criado com sucesso",
+          "ERROR_MESSAGE": "Erro ao criar segmento"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Excluir filtro",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirmar exclusão",
+            "MESSAGE": "Tem certeza que deseja excluir o filtro ",
+            "YES": "Sim, excluir",
+            "NO": "Não, mantenha"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Pasta excluída com sucesso",
+          "ERROR_MESSAGE": "Erro ao excluir pasta"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segmento apagado com sucesso",
+          "ERROR_MESSAGE": "Erro ao excluir segmento"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
index bbb03a5ae..2d210cc72 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automação",
-    "HEADER_BTN_TXT": "Adicionar regra de automação"
+    "HEADER_BTN_TXT": "Adicionar regra de automação",
+    "LOADING": "Buscando regras de automação",
+    "SIDEBAR_TXT": "<p><b>Regras de automação</b> <p>A automação pode substituir e automatizar processos existentes que requerem esforço manual. Você pode fazer muitas coisas com automação, incluindo adicionar rótulos e atribuir a conversa ao melhor agente. Então, a equipe se concentra no que faz melhor e passa mais pouco tempo em tarefas manuais.</p>",
+    "ADD": {
+      "TITLE": "Adicionar regra de automação",
+      "SUBMIT": "Criar",
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Nome da Regra",
+          "PLACEHOLDER": "Inserir nome da regra",
+          "ERROR": "O nome é obrigatório"
+        },
+        "DESC": {
+          "LABEL": "Descrição",
+          "PLACEHOLDER": "Inserir descrição de regra",
+          "ERROR": "Descrição obrigatória"
+        },
+        "EVENT": {
+          "LABEL": "Evento",
+          "PLACEHOLDER": "Por favor, selecione um",
+          "ERROR": "Evento é requerido"
+        },
+        "CONDITIONS": {
+          "LABEL": "Condições"
+        },
+        "ACTIONS": {
+          "LABEL": "Ações"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Adicionar condição",
+      "ACTION_BUTTON_LABEL": "Adicionar ação",
+      "API": {
+        "SUCCESS_MESSAGE": "Regra de automação adicionada com sucesso",
+        "ERROR_MESSAGE": "Não foi possível criar uma regra de automação, por favor, tente novamente mais tarde"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nome",
+        "Descrição",
+        "Ativo",
+        "Criado em"
+      ],
+      "404": "Nenhuma regra de automação encontrada"
+    },
+    "DELETE": {
+      "TITLE": "Excluir Regra de Automação",
+      "SUBMIT": "Excluir",
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "CONFIRM": {
+        "TITLE": "Confirmar exclusão",
+        "MESSAGE": "Você tem certeza que deseja excluir ",
+        "YES": "Sim, excluir ",
+        "NO": "Não, Mantenha "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Regra de automação excluída com sucesso",
+        "ERROR_MESSAGE": "Não foi possível excluir uma regra de automação, por favor, tente novamente mais tarde"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Editar regra de automação",
+      "SUBMIT": "Alterar",
+      "CANCEL_BUTTON_TEXT": "Cancelar",
+      "API": {
+        "SUCCESS_MESSAGE": "Regra de automação atualizada com sucesso",
+        "ERROR_MESSAGE": "Não foi possível atualizar a regra de automação, por favor, tente novamente mais tarde"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Duplicar",
+      "API": {
+        "SUCCESS_MESSAGE": "Automação clonada com sucesso",
+        "ERROR_MESSAGE": "Não foi possível clonar regra de automação, por favor, tente novamente mais tarde"
+      }
+    },
+    "FORM": {
+      "EDIT": "Alterar",
+      "CREATE": "Criar",
+      "DELETE": "Excluir",
+      "CANCEL": "Cancelar",
+      "RESET_MESSAGE": "Alterar o tipo de evento irá redefinir as condições e eventos que você adicionou abaixo"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
index 1737fbabf..835cbf90c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Adicionar Atalho",
     "LOADING": "Buscando Atalhos",
     "SEARCH_404": "Não existem itens correspondentes a esta consulta",
-    "SIDEBAR_TXT": "<p> <b> Atalho </b> </p> <p> são modelos de resposta pré-configuradas que poderão ser utilizadas ​​para enviar rapidamente uma resposta em uma conversa. </p> <p> Para criar um Atalho, basta clicar em <b> Adicionar Atalho </b>. Você também pode editar ou excluir um Atalho, clicando no botão Editar ou Excluir. </p> <p> Os atalhos são usadas com a ajuda de um <b> código </b>. Durante a conversa, os agentes podem acessar a lista dos atalhos digitando <b> '/' </b> . </p>",
+    "SIDEBAR_TXT": "<p><b>Respostas Prontas</b> </p><p> Respostas Prontas são templates de resposta salvos que podem ser usados para enviar rapidamente uma resposta a uma conversa. </p><p> Para criar uma Resposta Pronta, clique no <b>Adicionar Resposta Pronta</b>. Você também pode editar ou excluir uma resposta existente clicando no botão Editar ou Excluir </p><p> respostas prontas são usadas com a ajuda de <b>Código Curto</b>. Os agentes podem acessar as respostas prontas enquanto estiverem em um chat digitando <b>'/'</b> seguido pelo pequeno código. </p>",
     "LIST": {
       "404": "Não há atalhos disponíveis nesta conta.",
       "TITLE": "Gerenciar Atalhos",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Adicionar Atalho",
-      "DESC": "Atalhos são modelos de resposta que podem ser usados ​​para enviar rapidamente respostas à conversa.",
+      "DESC": "Respostas prontas são modelos de resposta salvos que podem ser usados para enviar rapidamente uma resposta para conversa.",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Código curto",
-          "PLACEHOLDER": "Insira o código",
+          "PLACEHOLDER": "Por favor, insira um código curto",
           "ERROR": "É necessário um código"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index fb34a0c5a..bb4dc68ff 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Enviar mensagem",
       "CANCEL": "Cancelar",
       "SUCCESS_MESSAGE": "Mensagem enviada!",
+      "GO_TO_CONVERSATION": "Visualizar",
       "ERROR_MESSAGE": "Não foi possível enviar! Tente novamente"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Pesquisar",
     "SEARCH_INPUT_PLACEHOLDER": "Procurar contatos",
     "FILTER_CONTACTS": "Filtro",
+    "FILTER_CONTACTS_SAVE": "Salvar Filtro",
+    "FILTER_CONTACTS_DELETE": "Excluir filtro",
     "LIST": {
       "LOADING_MESSAGE": "Carregando contatos...",
       "404": "Nenhum contato corresponde à sua pesquisa 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
index fab7a4361..c4d0e7498 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contém",
             "does_not_contain": "Não contém",
             "is_present": "Está presente",
-            "is_not_present": "Não está presente"
+            "is_not_present": "Não está presente",
+            "is_greater_than": "É maior que",
+            "is_lesser_than": "É menor que"
         },
         "ATTRIBUTES": {
             "NAME": "Nome",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Número de telefone",
             "IDENTIFIER": "Identificador",
             "CITY": "Cidade",
-            "COUNTRY": "País/região"
+            "COUNTRY": "País/região",
+            "CUSTOM_ATTRIBUTE_LIST": "Lista",
+            "CUSTOM_ATTRIBUTE_TEXT": "Texto",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Número",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Filtros Padrão",
+            "ADDITIONAL_FILTERS": "Filtros adicionais",
+            "CUSTOM_ATTRIBUTES": "Atributos Personalizados"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index df8b38309..b8334d603 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Carregando conversas",
     "CANNOT_REPLY": "Você não pode responder porque",
     "24_HOURS_WINDOW": "Restrições de janela de mensagem de 24 horas",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Atribuir a mim",
     "TWILIO_WHATSAPP_CAN_REPLY": "Você só pode responder a esta conversa usando um modelo de mensagem devido a",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restrições de janela de mensagem de 24 horas",
     "SELECT_A_TWEET_TO_REPLY": "Por favor, selecione um tweet para responder.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "O arquivo excede o limite de anexos {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Não foi possível enviar esta mensagem, por favor, tente novamente mais tarde",
     "SENT_BY": "Enviado por:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Não foi possível enviar a mensagem! Tente novamente",
+    "TRY_AGAIN": "Tentar novamente",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Selecione Agente",
       "REMOVE": "Excluir",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Convidar membros da sua equipe",
-      "DESCRIPTION": "Já que você está se preparando para conversar com seu cliente, traga seus colegas para ajudá-lo. Você pode convidar seus colegas de equipe adicionando o endereço de e-mail deles na lista de agentes.",
+      "DESCRIPTION": "Já que você está se preparando para conversar com seu cliente, traga seus colegas para ajudá-lo. Você pode convidar seus colegas de equipe adicionando os endereços de e-mail deles na lista de agentes.",
       "NEW_LINK": "Clique aqui para convidar um membro da equipe"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 87ff83fe0..ad136444e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Depois de quantos dias um ticket deve resolver a si mesmo caso não haja nenhuma atividade",
         "PLACEHOLDER": "30",
-        "ERROR": "Por favor insira um prazo válido até que seja considerado resolvido (mínimo 1 dia)"
+        "ERROR": "Por favor, insira um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "A continuidade das conversas com e-mails está ativada para sua conta.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 0dbc60085..a5370d4f1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Ativar saudação do canal",
-          "HELP_TEXT": "Enviar uma mensagem de saudação ao usuário quando ele iniciar a conversa.",
+          "HELP_TEXT": "Enviar uma mensagem de saudação aos usuários quando eles iniciarem a conversa.",
           "ENABLED": "Ativado",
           "DISABLED": "Desativado"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "Canal SMS via Twilio",
-        "DESC": "Comece a apoiar seus clientes através de SMS com integração Twilio."
+        "TITLE": "Canal SMS",
+        "DESC": "Comece a apoiar seus clientes via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "Não foi possível salvar o canal SMS"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "ID da Conta",
+            "PLACEHOLDER": "Por favor, insira sua ID de conta de bandwidth",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "API_KEY": {
+            "LABEL": "Chave API",
+            "PLACEHOLDER": "Por favor, digite a sua chave da Bandwith API",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "API_SECRET": {
+            "LABEL": "Chave secreta API",
+            "PLACEHOLDER": "Por favor insira o seu Segredo da API Bandwith",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "ID da aplicação",
+            "PLACEHOLDER": "Por favor, insira sua ID de aplicação de bandwidth",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nome da Caixa de Entrada",
+            "PLACEHOLDER": "Por favor, digite um nome para caixa de entrada",
+            "ERROR": "Este campo é obrigatório"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Número de telefone",
+            "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
+            "ERROR": "Por favor, insira um valor válido. O número de telefone deve começar com o sinal `+`."
+          },
+          "SUBMIT_BUTTON": "Criar canal de banda",
+          "API": {
+            "ERROR_MESSAGE": "Não fomos capazes de autenticar as credenciais de banda larga, por favor tente novamente"
+          },
+          "API_CALLBACK": {
+            "TITLE": "URL de retorno",
+            "SUBTITLE": "Você precisa configurar o URL de retorno de mensagem na banda com a URL mencionada aqui."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "Canal do WhatsApp",
@@ -305,6 +353,14 @@
         "ENABLED": "Ativado",
         "DISABLED": "Desativado"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Ativado",
+        "DISABLED": "Desativado"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Ativado",
+        "DISABLED": "Desativado"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Habilitado"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Habilitar atribuição automática",
       "ENABLE_CSAT": "Habilitar CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Ativar/Desativar pesquisa CSAT(satisfação do cliente) após resolver uma conversa",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Habilitar continuidade das conversas por e-mail",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "As conversas continuarão sobre o e-mail se o endereço de e-mail de contato estiver disponível.",
       "INBOX_UPDATE_TITLE": "Configurações da Caixa de entrada",
       "INBOX_UPDATE_SUB_TEXT": "Atualize suas configurações de caixa de entrada",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ativar ou desativar a atribuição automática de novas conversas aos agentes adicionados a essa caixa de entrada.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Identificador da caixa de entrada",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use o token 'inbox_identifier' mostrado aqui para autenticar os seus clientes API.",
       "FORWARD_EMAIL_TITLE": "Encaminhar para o E-mail",
-      "FORWARD_EMAIL_SUB_TEXT": "Comece a encaminhar seus e-mails para o seguinte endereço de e-mail."
+      "FORWARD_EMAIL_SUB_TEXT": "Comece a encaminhar seus e-mails para o seguinte endereço de e-mail.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Permitir mensagens após a resolução da conversa",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permite que os usuários finais enviem mensagens mesmo depois que a conversa for resolvida."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautorizar",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/index.js b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 291b8ad9e..e786eba18 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Por favor, digite a senha atual"
       },
       "PASSWORD": {
-        "LABEL": "Senha",
+        "LABEL": "Nova senha",
         "ERROR": "Por favor, digite uma senha de comprimento 6 ou mais",
         "PLACEHOLDER": "Por favor, digite uma nova senha"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirme a nova senha",
         "ERROR": "A confirmação da senha é diferente. Favor digitar novamente",
-        "PLACEHOLDER": "Por favor, digite sua senha novamente"
+        "PLACEHOLDER": "Por favor, digite sua nova senha "
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Atributos Personalizados",
     "AUTOMATION": "Automação",
     "TEAMS": "Times",
+    "CUSTOM_VIEWS_FOLDER": "Pastas",
+    "CUSTOM_VIEWS_SEGMENTS": "Segmentos",
     "ALL_CONTACTS": "Todos os Contatos",
     "TAGGED_WITH": "Marcado com",
     "NEW_LABEL": "Nova etiqueta",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
index adca03848..0fc7e7dd3 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Criar nova equipe",
     "HEADER": "Times",
-    "SIDEBAR_TXT": "<p><b>Departamentos</b></p> <p>As equipes permitem que você organize seus agentes em grupos baseados em suas responsabilidades. <br /> Um usuário pode fazer parte de várias equipes. Você pode atribuir conversas a uma equipe quando você estiver trabalhando colaborativamente. </p>",
+    "SIDEBAR_TXT": "<p><b>Equipes</b></p> <p>As equipes permitem que você organize seus agentes em grupos baseados em suas responsabilidades. <br /> Um agente pode fazer parte de várias equipes. Você pode atribuir conversas a uma equipe quando você estiver trabalhando colaborativamente. </p>",
     "LIST": {
       "404": "Não existem agentes associados a esta conta.",
       "EDIT_TEAM": "Editar equipe"
diff --git a/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
index d797b1504..f5e9044dc 100644
--- a/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Etichete",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Editează atribut personalizat"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Numele este obligatoriu",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Renunță",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Confirmă ștergerea",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Da, șterge",
+            "NO": "Nu, păstreaza"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/automation.json b/app/javascript/dashboard/i18n/locale/ro/automation.json
index 6111f969f..3bdce48ee 100644
--- a/app/javascript/dashboard/i18n/locale/ro/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automatizare",
-    "HEADER_BTN_TXT": "Adaugă Regulă de Automatizare"
+    "HEADER_BTN_TXT": "Adaugă Regulă de Automatizare",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Adaugă Regulă de Automatizare",
+      "SUBMIT": "Creeaza",
+      "CANCEL_BUTTON_TEXT": "Renunță",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Numele este obligatoriu"
+        },
+        "DESC": {
+          "LABEL": "Descriere",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Descrierea este obligatorie"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Vă rugăm să selectaţi un tip",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Actiuni"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Nume",
+        "Descriere",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Şterge",
+      "CANCEL_BUTTON_TEXT": "Renunță",
+      "CONFIRM": {
+        "TITLE": "Confirmă ștergerea",
+        "MESSAGE": "Sigur doriți să ștergeți ",
+        "YES": "Da, șterge ",
+        "NO": "Nu, păstreaza"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Editare",
+      "CANCEL_BUTTON_TEXT": "Renunță",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Editare",
+      "CREATE": "Creeaza",
+      "DELETE": "Şterge",
+      "CANCEL": "Renunță",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
index a014999d9..adf9b60a2 100644
--- a/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Adauga Răspunsuri predefinite",
     "LOADING": "Preluarea Răspunsuri predefinite",
     "SEARCH_404": "Nu există elemente care să corespundă acestei interogări",
-    "SIDEBAR_TXT": "<p><b>Răspunsuri ajustate</b> </p><p> Răspunsurile ajustate sunt salvate șabloanele de răspuns care pot fi folosite pentru a trimite rapid un răspuns la o conversație . </p><p> Pentru a crea un răspuns programat, doar fă clic pe <b>Adaugă Răspuns Ajustat</b>. De asemenea, poți edita sau șterge un răspuns existent făcând clic pe butonul Editare sau Șterge </p><p> Răspunsurile ajustate sunt folosite cu ajutorul a <b>Coduri scurte</b>. Agenții pot accesa mesajele conservate în timpul unei conversații scriind <b>'/'</b> urmat de codul scurt. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Nu există răspunsuri predefinite disponibile în acest cont.",
       "TITLE": "Gestionare Răspunsuri predefinite",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Adauga Răspunsuri predefinite",
-      "DESC": "Răspunsurile definite sunt șabloane de răspuns salvate care pot fi folosite pentru a trimite rapid un răspuns la conversație .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Cod scurt",
-          "PLACEHOLDER": "Te rugăm să introduci un cod scurt",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Codul scurt este necesar"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index be632c9e8..20ff049d5 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Trimite mesaj",
       "CANCEL": "Renunță",
       "SUCCESS_MESSAGE": "Mesaj trimis!",
+      "GO_TO_CONVERSATION": "Vizualizare",
       "ERROR_MESSAGE": "Nu s-a putut trimite! Încearcă din nou"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Caută",
     "SEARCH_INPUT_PLACEHOLDER": "Caută contacte",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Se încarcă contactele...",
       "404": "Niciun contact nu se potrivește cu căutarea ta 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ro/contactFilters.json b/app/javascript/dashboard/i18n/locale/ro/contactFilters.json
index 6a6064f51..dbfd3a7ac 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Nume",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Număr de telefon",
             "IDENTIFIER": "Identifier",
             "CITY": "Oraș",
-            "COUNTRY": "Țară"
+            "COUNTRY": "Țară",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Editează atribut personalizat"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index cacdca179..d62acaf9a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Încărcare conversații",
     "CANNOT_REPLY": "Nu poți răspunde din cauza",
     "24_HOURS_WINDOW": "Restricţie fereastră mesaj 24 de ore",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "Poți răspunde la această conversație doar folosind un mesaj șablon datorat",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restricţie fereastră mesaj 24 de ore",
     "SELECT_A_TWEET_TO_REPLY": "Te rugăm să selectezi un tweet pentru a răspunde.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Fisierul depaseste limita de {MAXIMUM_FILE_UPLOAD_SIZE} atasamente",
     "MESSAGE_ERROR": "Mesajul nu poate fi trimis, te rugăm să încerci din nou mai târziu",
     "SENT_BY": "Trimis de:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Selectează agent",
       "REMOVE": "Elimină",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index 2e0f93d06..3545de235 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Numărul de zile de pe bilet ar trebui să se rezolve automat dacă nu există activitate",
         "PLACEHOLDER": "30",
-        "ERROR": "Te rugăm să introduci o durată de rezolvare automată (minim 1 zi)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuitatea conversației cu e-mailurile este activată pentru contul dvs.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index cd3d63597..4783ef362 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Activare salut canal",
-          "HELP_TEXT": "Trimite un mesaj de salut utilizatorului atunci când începe conversația.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Activat",
           "DISABLED": "Dezactivat"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Acest câmp este obligatoriu"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Acest câmp este obligatoriu"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Acest câmp este obligatoriu"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Acest câmp este obligatoriu"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Nume Inbox",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Acest câmp este obligatoriu"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Număr de telefon",
+            "PLACEHOLDER": "Introduceți numărul de telefon de la care va fi trimis mesajul.",
+            "ERROR": "Introduceți o valoare validă. Numărul de telefon ar trebui să înceapă cu semnul `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Activat",
         "DISABLED": "Dezactivat"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Activat",
+        "DISABLED": "Dezactivat"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Activat",
+        "DISABLED": "Dezactivat"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Activare atribuire automată",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Setări Inbox",
       "INBOX_UPDATE_SUB_TEXT": "Actualizează setările de inbox",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activează sau dezactivează atribuirea automată a conversațiilor noi la agenții adăugați la această căsuță poștală.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Începeți să vă trimiteți e-mailuri la următoarea adresă de e-mail."
+      "FORWARD_EMAIL_SUB_TEXT": "Începeți să vă trimiteți e-mailuri la următoarea adresă de e-mail.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautorizează",
diff --git a/app/javascript/dashboard/i18n/locale/ro/index.js b/app/javascript/dashboard/i18n/locale/ro/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ro/index.js
+++ b/app/javascript/dashboard/i18n/locale/ro/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 22142fb2a..5ab34685c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Parola",
+        "LABEL": "New password",
         "ERROR": "Te rugăm să introduci o parolă pentru lungimea de 6 caractere sau mai mult",
         "PLACEHOLDER": "Te rog introdu o noua parola"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirmare parolă nouă",
         "ERROR": "Confirmarea parolei trebuie să se potrivească cu parola",
-        "PLACEHOLDER": "Vă rugăm să reintroduceţi parola"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Editează atribut personalizat",
     "AUTOMATION": "Automatizare",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
index 7e9173c88..ce8f8790f 100644
--- a/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Crează o echipă nouă",
     "HEADER": "Echipe",
-    "SIDEBAR_TXT": "<p><b>Echipele</b></p> <p>vă permit să organizați agenții în grupuri în funcție de responsabilitățile lor. <br /> Un utilizator poate face parte din mai multe echipe. Poți atribui conversații unei echipe atunci când lucrezi colaborativ. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "Nu există echipe create în acest cont.",
       "EDIT_TEAM": "Editează echipa"
diff --git a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
index a086358ee..e72a0799d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Содержит",
       "does_not_contain": "Не содержит",
       "is_present": "Присутствует",
-      "is_not_present": "Отсутствует"
+      "is_not_present": "Отсутствует",
+      "is_greater_than": "Больше чем",
+      "is_lesser_than": "Меньше чем"
     },
     "ATTRIBUTES": {
       "STATUS": "Статус",
@@ -31,7 +33,54 @@
       "LABELS": "Категории",
       "BROWSER_LANGUAGE": "Язык браузера",
       "COUNTRY_NAME": "Страна",
-      "REFERER_LINK": "Ссылка реферера"
+      "REFERER_LINK": "Ссылка реферера",
+      "CUSTOM_ATTRIBUTE_LIST": "Список",
+      "CUSTOM_ATTRIBUTE_TEXT": "Текст",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Число",
+      "CUSTOM_ATTRIBUTE_LINK": "Ссылка",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Флажок"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Стандартные фильтры",
+      "ADDITIONAL_FILTERS": "Дополнительные фильтры",
+      "CUSTOM_ATTRIBUTES": "Пользовательские атрибуты"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Вы хотите сохранить этот фильтр?",
+        "LABEL": "Название фильтра",
+        "PLACEHOLDER": "Введите имя для этого фильтра",
+        "ERROR_MESSAGE": "Необходимо указать имя",
+        "SAVE_BUTTON": "Сохранить фильтр",
+        "CANCEL_BUTTON": "Отменить",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Папка успешно создана",
+          "ERROR_MESSAGE": "Ошибка при создании папки"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Сегмент успешно создан",
+          "ERROR_MESSAGE": "Ошибка при создании сегмента"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Удалить фильтр",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Подтвердите удаление",
+            "MESSAGE": "Вы уверены, что хотите удалить фильтр ",
+            "YES": "Да, удалить",
+            "NO": "Нет, не удалять"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Папка успешно удалена",
+          "ERROR_MESSAGE": "При удалении папки произошла ошибка"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Сегмент успешно удален",
+          "ERROR_MESSAGE": "При удалении сегмента произошла ошибка"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/automation.json b/app/javascript/dashboard/i18n/locale/ru/automation.json
index 31ab06919..515fb8656 100644
--- a/app/javascript/dashboard/i18n/locale/ru/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Автоматизация",
-    "HEADER_BTN_TXT": "Добавить правило автоматизации"
+    "HEADER_BTN_TXT": "Добавить правило автоматизации",
+    "LOADING": "Получение правил автоматизации",
+    "SIDEBAR_TXT": "<p><b>Правила автоматизации</b> <p>Автоматизация может заменить и автоматизировать существующие процессы, требующие ручных усилий. Вы можете сделать многое с автоматизацией, включая добавление меток и назначение разговора лучшему оператору. Таким образом, команда сосредоточена на том, что она делает лучше всего и может тратить больше времени на более важные задачи.</p>",
+    "ADD": {
+      "TITLE": "Добавить правило автоматизации",
+      "SUBMIT": "Создать",
+      "CANCEL_BUTTON_TEXT": "Отменить",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Название правила",
+          "PLACEHOLDER": "Введите название правила",
+          "ERROR": "Необходимо указать имя"
+        },
+        "DESC": {
+          "LABEL": "Описание",
+          "PLACEHOLDER": "Введите описание правила",
+          "ERROR": "Необходимо описание"
+        },
+        "EVENT": {
+          "LABEL": "Событие",
+          "PLACEHOLDER": "Пожалуйста, выберите один",
+          "ERROR": "Необходимо указать событие"
+        },
+        "CONDITIONS": {
+          "LABEL": "Условия"
+        },
+        "ACTIONS": {
+          "LABEL": "Действия"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Добавить условие",
+      "ACTION_BUTTON_LABEL": "Добавить действие",
+      "API": {
+        "SUCCESS_MESSAGE": "Правило автоматизации успешно добавлено",
+        "ERROR_MESSAGE": "Не удалось создать правило автоматизации, пожалуйста, повторите попытку позже"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Имя",
+        "Описание",
+        "Активно",
+        "Создано"
+      ],
+      "404": "Правила автоматизации не найдены"
+    },
+    "DELETE": {
+      "TITLE": "Удалить правило автоматизации",
+      "SUBMIT": "Удалить",
+      "CANCEL_BUTTON_TEXT": "Отменить",
+      "CONFIRM": {
+        "TITLE": "Подтвердите удаление",
+        "MESSAGE": "Вы точно хотите удалить ",
+        "YES": "Да, удалить ",
+        "NO": "Нет, не удалять "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Правило автоматизации успешно удалено",
+        "ERROR_MESSAGE": "Не удалось удалить правило автоматизации, пожалуйста, повторите попытку позже"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Изменить правило автоматизации",
+      "SUBMIT": "Редактировать",
+      "CANCEL_BUTTON_TEXT": "Отменить",
+      "API": {
+        "SUCCESS_MESSAGE": "Правило автоматизации успешно обновлено",
+        "ERROR_MESSAGE": "Не удалось обновить правило автоматизации, повторите попытку позже"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Копировать",
+      "API": {
+        "SUCCESS_MESSAGE": "Правило автоматизации успешно скопировано",
+        "ERROR_MESSAGE": "Не удалось скопировать правило автоматизации, повторите попытку позже"
+      }
+    },
+    "FORM": {
+      "EDIT": "Редактировать",
+      "CREATE": "Создать",
+      "DELETE": "Удалить",
+      "CANCEL": "Отменить",
+      "RESET_MESSAGE": "Изменение типа события сбросит условия и события, добавленные вами ниже"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
index cd8392c3d..d550d9d97 100644
--- a/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Добавить шаблонный ответ",
     "LOADING": "Загружаем шаблонные ответы",
     "SEARCH_404": "Нет шаблонных ответов, соответствующих запросу",
-    "SIDEBAR_TXT": "<p><b>Шаблонные ответы</b> </p><p> Шаблонные ответы – это сохраненные шаблоны сообщений, которые можно быстро использовать в диалоге. </p><p> Нажмите <b>Добавить шаблонный ответ</b> для добавления шаблонного ответа. Вы также можете редактировать или удалять существующие шаблонные ответы с помощью кнопок Редактировать или Удалить. </p><p> Шаблонные ответы используются с помощью <b>команд</b>. Операторы могут отправить шаблонные ответ по нажатию <b>'/'</b>, после чего требуется ввести команду. </p>",
+    "SIDEBAR_TXT": "<p><b>Шаблонные ответы</b> </p><p> Шаблонные ответы – это сохраненные шаблоны сообщений, которые можно быстро использовать в диалоге. </p><p> Нажмите <b>Добавить шаблонный ответ</b> для добавления шаблонного ответа. Вы также можете редактировать или удалять существующие шаблонные ответы с помощью кнопок Редактировать или Удалить. </p><p> Шаблонные ответы можно использовать с помощью <b>горячих клавиш</b>. Операторы могут выбрать шаблонный ответ после нажатия <b>'/'</b>, в поле сообщения. </p>",
     "LIST": {
       "404": "У вас нет шаблонных ответов.",
       "TITLE": "Управление шаблонными ответами",
@@ -22,7 +22,7 @@
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Команда",
-          "PLACEHOLDER": "Пожалуйста введите команду",
+          "PLACEHOLDER": "Пожалуйста, введите сокращение",
           "ERROR": "Команда обязательна"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index bc6332f92..3bdcf1068 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Отправить сообщение",
       "CANCEL": "Отменить",
       "SUCCESS_MESSAGE": "Сообщение отправлено!",
+      "GO_TO_CONVERSATION": "Просмотр",
       "ERROR_MESSAGE": "Не удалось отправить! Попробуйте еще раз"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Поиск",
     "SEARCH_INPUT_PLACEHOLDER": "Поиск по контактам",
     "FILTER_CONTACTS": "Фильтр",
+    "FILTER_CONTACTS_SAVE": "Сохранить фильтр",
+    "FILTER_CONTACTS_DELETE": "Удалить фильтр",
     "LIST": {
       "LOADING_MESSAGE": "Загрузка контактов...",
       "404": "Нет контактов по вашему запросу 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ru/contactFilters.json b/app/javascript/dashboard/i18n/locale/ru/contactFilters.json
index 4af14ae2e..b267b64d1 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Содержит",
             "does_not_contain": "Не содержит",
             "is_present": "Присутствует",
-            "is_not_present": "Отсутствует"
+            "is_not_present": "Отсутствует",
+            "is_greater_than": "Больше чем",
+            "is_lesser_than": "Меньше чем"
         },
         "ATTRIBUTES": {
             "NAME": "Имя",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Номер телефона",
             "IDENTIFIER": "Идентификатор",
             "CITY": "Город",
-            "COUNTRY": "Страна"
+            "COUNTRY": "Страна",
+            "CUSTOM_ATTRIBUTE_LIST": "Список",
+            "CUSTOM_ATTRIBUTE_TEXT": "Текст",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Число",
+            "CUSTOM_ATTRIBUTE_LINK": "Ссылка",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Флажок"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Стандартные фильтры",
+            "ADDITIONAL_FILTERS": "Дополнительные фильтры",
+            "CUSTOM_ATTRIBUTES": "Пользовательские атрибуты"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 1471e3b12..3e609915d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Загрузка диалогов",
     "CANNOT_REPLY": "Вы не можете ответить из-за",
     "24_HOURS_WINDOW": "Ограничение на 24 часа",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Назначить мне",
     "TWILIO_WHATSAPP_CAN_REPLY": "Вы можете ответить в этой беседе только с помощью шаблона сообщения",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Ограничение на 24 часа",
     "SELECT_A_TWEET_TO_REPLY": "Пожалуйста, выберите твит для ответа.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Превышен размер загружаемого файла - {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Не удается отправить это сообщение, повторите попытку позже",
     "SENT_BY": "Отправитель:",
+    "BOT": "Бот",
+    "SEND_FAILED": "Не удалось удалить сообщение! Попробуйте еще раз",
+    "TRY_AGAIN": "повторить",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Выбрать Агента",
       "REMOVE": "Удалить",
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 1b203cc3d..aa96f9496 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Количество дней после того, как тикет будет автоматически решен, если нет активности",
         "PLACEHOLDER": "30",
-        "ERROR": "Введите корректную длительность для авто решения (минимум 1 день)"
+        "ERROR": "Введите корректную длительность для автозавершения диалога (минимум 1 день, максимум 999)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Для вашего аккаунта включено продолжение диалогов по электронной почте.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 81e036437..7a9f58e99 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS канал через Twilio",
-        "DESC": "Начните поддерживать своих клиентов через SMS с Twilio интеграцией."
+        "TITLE": "SMS-канал",
+        "DESC": "Начните поддерживать ваших клиентов с помощью SMS.",
+        "PROVIDERS": {
+          "LABEL": "Поставщик API",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "Не удалось сохранить SMS-канал"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "ID аккаунта",
+            "PLACEHOLDER": "Пожалуйста, введите ваш идентификатор аккаунта Bandwidth",
+            "ERROR": "Это поле обязательно"
+          },
+          "API_KEY": {
+            "LABEL": "Ключ API",
+            "PLACEHOLDER": "Пожалуйста, введите ваш Bandwith API Key",
+            "ERROR": "Это поле обязательно"
+          },
+          "API_SECRET": {
+            "LABEL": "Секретный ключ API",
+            "PLACEHOLDER": "Пожалуйста, введите ваш секретный ключ аккаунта Bandwidth",
+            "ERROR": "Это поле обязательно"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "ID приложения",
+            "PLACEHOLDER": "Пожалуйста, введите ваш ID аккаунта Bandwidth",
+            "ERROR": "Это поле обязательно"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Имя источника",
+            "PLACEHOLDER": "Пожалуйста введите имя канала",
+            "ERROR": "Это поле обязательно"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Номер телефона",
+            "PLACEHOLDER": "Введите номер телефона, с которого будет отправлено сообщение.",
+            "ERROR": "Пожалуйста, введите правильный номер телефона, начинающийся с «+»."
+          },
+          "SUBMIT_BUTTON": "Создать канал Bandwidth",
+          "API": {
+            "ERROR_MESSAGE": "Мы не смогли авторизоваться в Bandwidth. Пожалуйста, попробуйте еще раз"
+          },
+          "API_CALLBACK": {
+            "TITLE": "URL",
+            "SUBTITLE": "Вы должны настроить URL колбеков в Bandwidth используя этот URL."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp канал",
@@ -305,6 +353,14 @@
         "ENABLED": "Включено",
         "DISABLED": "Выключено"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Включено",
+        "DISABLED": "Выключено"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Включено",
+        "DISABLED": "Выключено"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Включить"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Включить автоназначение",
       "ENABLE_CSAT": "Включить CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Включить/выключить опрос CSAT(степень удовлетворенности пользователя) после завершения беседы",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Включить непрерывность разговоров по электронной почте",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Разговоры будут продолжаться по электронной почте, если доступен контактный адрес электронной почты.",
       "INBOX_UPDATE_TITLE": "Настройки источника",
       "INBOX_UPDATE_SUB_TEXT": "Изменить настройки источника",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Включить или отключить автоматическое назначение новых разговоров к агентам, добавленным к этому источнику.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Идентификатор входящего канала",
       "INBOX_IDENTIFIER_SUB_TEXT": "Используйте токен `inbox_identifier` для аутентификации ваших клиентов API.",
       "FORWARD_EMAIL_TITLE": "Переслать на Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Начните пересылать свои письма на этот email."
+      "FORWARD_EMAIL_SUB_TEXT": "Начните пересылать свои письма на этот email.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Разрешить отправлять сообщения после завершения разговора",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Разрешить пользователям отправлять сообщения даже после того, как разговор будет завершен."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Войти заново",
diff --git a/app/javascript/dashboard/i18n/locale/ru/index.js b/app/javascript/dashboard/i18n/locale/ru/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ru/index.js
+++ b/app/javascript/dashboard/i18n/locale/ru/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 000b725c5..0d2a87558 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Пожалуйста, введите текущий пароль"
       },
       "PASSWORD": {
-        "LABEL": "Пароль",
+        "LABEL": "Новый пароль",
         "ERROR": "Введите пароль из 6 или более символов",
         "PLACEHOLDER": "Пожалуйста, введите новый пароль"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Подтвердите новый пароль",
         "ERROR": "Подтверждение пароля должно соответствовать паролю",
-        "PLACEHOLDER": "Пожалуйста, введите пароль еще раз"
+        "PLACEHOLDER": "Пожалуйста, введите новый пароль еще раз"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Пользовательские атрибуты",
     "AUTOMATION": "Автоматизация",
     "TEAMS": "Команды",
+    "CUSTOM_VIEWS_FOLDER": "Папки",
+    "CUSTOM_VIEWS_SEGMENTS": "Сегменты",
     "ALL_CONTACTS": "Все контакты",
     "TAGGED_WITH": "С метками",
     "NEW_LABEL": "Новая метка",
diff --git a/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json b/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json
index fc6ac620e..433245feb 100644
--- a/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Vlastné atribúty"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Zrušiť",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Potvrdiť vymazanie",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Áno, vymazať",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/automation.json b/app/javascript/dashboard/i18n/locale/sk/automation.json
index c3614a990..d6782ac24 100644
--- a/app/javascript/dashboard/i18n/locale/sk/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Zrušiť",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Akcie"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Meno",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Vymazať",
+      "CANCEL_BUTTON_TEXT": "Zrušiť",
+      "CONFIRM": {
+        "TITLE": "Potvrdiť vymazanie",
+        "MESSAGE": "Určite chcete vymazať ",
+        "YES": "Áno, vymazať ",
+        "NO": "Nie, ponechať "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Upraviť",
+      "CANCEL_BUTTON_TEXT": "Zrušiť",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Upraviť",
+      "CREATE": "Create",
+      "DELETE": "Vymazať",
+      "CANCEL": "Zrušiť",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/sk/cannedMgmt.json
index 88489dfe0..be02901e8 100644
--- a/app/javascript/dashboard/i18n/locale/sk/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Pridať Uloženú odpoveď",
     "LOADING": "Uložené odpovede sa načítavajú",
     "SEARCH_404": "Neexistujú žiadne položky, ktoré by zodpovedali tejto požiadavke",
-    "SIDEBAR_TXT": "<p><b>Uložené odpovede</b> </p><p> Uložené odpovede sú uložené šablóny odpovedí, ktoré môžete použiť na rýchle odoslanie odpovede na konverzáciu . </p><p> Na vytvorenie Uloženej odpovede kliknite na <b>Pridať uloženú odpoveď</b>. Existujúcu uloženú odpoveď môžete tiež upraviť alebo vymazať kliknutím na tlačidlo Upraviť alebo Vymazať </p><p>Uložené odpovede sa používajú pomocou <b>krátkych kódov</b>. Agenti môžu pristupovať k uloženým odpovediam počas chatu zadaním <b>'/'</b>, za ktorou nasleduje krátky kód. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Žiadne uložené odpovede nie sú k dispozícii pre tento účet.",
       "TITLE": "Manažuj uložené odpovede",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Pridať Uloženú odpoveď",
-      "DESC": "Uložené odpovede sú uložené šablóny odpovedí, ktoré môžete použiť na rýchle odoslanie odpovede na konverzáciu .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Zrušiť",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krátky kód",
-          "PLACEHOLDER": "Prosím zadajte krátky kód",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Vyžaduje sa krátky kód"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index fb172088b..415f19f54 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Poslať správu",
       "CANCEL": "Zrušiť",
       "SUCCESS_MESSAGE": "Správa poslaná!",
+      "GO_TO_CONVERSATION": "View",
       "ERROR_MESSAGE": "Nepodarilo sa odoslať! Skúste to znova"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Hľadať",
     "SEARCH_INPUT_PLACEHOLDER": "Hľadať kontakty",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Kontakty sa hľadajú...",
       "404": "Žiadny kontakt nezodpovedá vášmu vyhľadávaniu 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/sk/contactFilters.json b/app/javascript/dashboard/i18n/locale/sk/contactFilters.json
index 072f67325..f8e676072 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Meno",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefónne číslo",
             "IDENTIFIER": "Identifier",
             "CITY": "Mesto",
-            "COUNTRY": "Krajina"
+            "COUNTRY": "Krajina",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Vlastné atribúty"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index e50630423..724103283 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Načítavajú sa konverzácie",
     "CANNOT_REPLY": "Neviete odpovedať, pretože",
     "24_HOURS_WINDOW": "24-hodinové obmedzenie okna správ",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Prideliť mne",
     "TWILIO_WHATSAPP_CAN_REPLY": "Na túto konverzáciu môžete odpovedať len pomocou šablóny správy z dôvodu",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24-hodinové obmedzenie okna správ",
     "SELECT_A_TWEET_TO_REPLY": "Vyberte tweet, na ktorý chcete odpovedať.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Remove",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Pozvite členov svojho tímu",
-      "DESCRIPTION": "Keďže sa pripravujete na rozhovor so zákazníkom, pozvite si na pomoc kolegov z tímu. Svojich tímových kolegov môžete pozvať pridaním ich e-mailovej adresy do zoznamu agentov.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Kliknite sem pre pozvanie člena tímu"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/csatMgmt.json b/app/javascript/dashboard/i18n/locale/sk/csatMgmt.json
index d7d2efc2a..0eb57c00f 100644
--- a/app/javascript/dashboard/i18n/locale/sk/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/csatMgmt.json
@@ -1,6 +1,6 @@
 {
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Ohodnoťte konverzáciu",
+    "PLACEHOLDER": "Povedzte nám viac..."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index 440651478..074577ebd 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Počet dní po automatickom vyriešení tiketu, ak sa nevykonáva žiadna aktivita",
         "PLACEHOLDER": "30",
-        "ERROR": "Zadajte platnú dobu kým sa tiket automaticky vyrieši (minimálne 1 deň)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Pre vaše konto je povolená kontinuita konverzácie s e-mailami.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index b13864e6c..e722183ec 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Povoliť pozdav v kanáli",
-          "HELP_TEXT": "Odošlite uvítaciu správu používateľovi pri začatí konverzácie.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Zapnuté",
           "DISABLED": "Vypnuté"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "ID účtu",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Toto pole je povinné"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Toto pole je povinné"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Toto pole je povinné"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Toto pole je povinné"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Meno schránky",
+            "PLACEHOLDER": "Prosím vyplňte meno schránky",
+            "ERROR": "Toto pole je povinné"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefónne číslo",
+            "PLACEHOLDER": "Zadajte telefónne číslo, z ktorého bude správa odoslaná.",
+            "ERROR": "Zadajte platnú hodnotu. Telefónne číslo by malo začínať znakom `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Zapnuté",
+        "DISABLED": "Vypnuté"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Zapnuté",
+        "DISABLED": "Vypnuté"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Indetifikátor schránky",
       "INBOX_IDENTIFIER_SUB_TEXT": "Na overenie klientov API použite tu uvedený token `inbox_identifier`.",
       "FORWARD_EMAIL_TITLE": "Preposlanť na e-mail",
-      "FORWARD_EMAIL_SUB_TEXT": "Začnite preposielať e-maily na túto e-mailovú adresu."
+      "FORWARD_EMAIL_SUB_TEXT": "Začnite preposielať e-maily na túto e-mailovú adresu.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Znova autorizovať",
diff --git a/app/javascript/dashboard/i18n/locale/sk/index.js b/app/javascript/dashboard/i18n/locale/sk/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/sk/index.js
+++ b/app/javascript/dashboard/i18n/locale/sk/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 596974e12..679175c70 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Prosím zadajte momentálne heslo"
       },
       "PASSWORD": {
-        "LABEL": "Heslo",
+        "LABEL": "New password",
         "ERROR": "Zadajte heslo s dĺžkou 6 alebo viac",
         "PLACEHOLDER": "Prosím zadajte nové heslo"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Potvrďte nové heslo",
         "ERROR": "Potvrdzovacie heslo by sa malo zhodovať s heslom",
-        "PLACEHOLDER": "Znovu zadajte svoje heslo"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
index b5d865710..85f9669ab 100644
--- a/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json b/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json
index 0654af0ee..0fedc5c09 100644
--- a/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
@@ -31,7 +33,54 @@
       "LABELS": "Etiketter",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Egna egenskaper"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Avbryt",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Bekräfta borttagning",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Ja, ta bort",
+            "NO": "Nej, behåll"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/automation.json b/app/javascript/dashboard/i18n/locale/sv/automation.json
index c3614a990..bc1ad82da 100644
--- a/app/javascript/dashboard/i18n/locale/sv/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Skapa",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Beskrivning",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Åtgärder"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Namn",
+        "Beskrivning",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Radera",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "CONFIRM": {
+        "TITLE": "Bekräfta borttagning",
+        "MESSAGE": "Är du säker på att ta bort ",
+        "YES": "Ja, ta bort ",
+        "NO": "Nej, behåll "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Redigera",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Redigera",
+      "CREATE": "Skapa",
+      "DELETE": "Radera",
+      "CANCEL": "Avbryt",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/campaign.json b/app/javascript/dashboard/i18n/locale/sv/campaign.json
index b45365c6d..570783635 100644
--- a/app/javascript/dashboard/i18n/locale/sv/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/sv/campaign.json
@@ -34,7 +34,7 @@
           "ERROR": "Inbox is required"
         },
         "MESSAGE": {
-          "LABEL": "Message",
+          "LABEL": "Meddelande",
           "PLACEHOLDER": "Please enter the message of campaign",
           "ERROR": "Message is required"
         },
@@ -88,7 +88,7 @@
       "404": "There are no campaigns created for this inbox.",
       "TABLE_HEADER": {
         "TITLE": "Title",
-        "MESSAGE": "Message",
+        "MESSAGE": "Meddelande",
         "INBOX": "Inkorg",
         "STATUS": "Status",
         "SENDER": "Sender",
diff --git a/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json
index 5746b86e0..c8aa200d8 100644
--- a/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Lägg till svarsmall",
     "LOADING": "Hämtar svarsmallar",
     "SEARCH_404": "Det finns inga objekt som matchar denna fråga",
-    "SIDEBAR_TXT": "<p><b>Svarsmallar</b> </p><p> Svarsmallar är sparade mallar som kan användas för att snabbt skicka ett svar till en konversation. </p><p> För att skapa en svarsmall, klicka bara på <b>Lägg till svarsmall</b>. Du kan också redigera eller ta bort en befintlig svarsmall genom att klicka på knapparna Redigera eller Ta bort </p><p> Svarsmallar används med hjälp av <b>korta koder</b>. Agenter kan komma åt svarsmallar medan de är på en chatt genom att skriva <b>'/'</b> följt av kortkoden. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Det finns inga svarsmallar tillgängliga på detta konto.",
       "TITLE": "Hantera svarsmallar",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Lägg till svarsmall",
-      "DESC": "Svarsmallar är fördefinierade mallar som kan användas för att snabbt skicka ut svar till konversationer.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Avbryt",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Kortkod",
-          "PLACEHOLDER": "Ange en kortkod",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Kortkod krävs"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 610055496..154e9284a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Skicka meddelande",
       "CANCEL": "Avbryt",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Visa",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Sök",
     "SEARCH_INPUT_PLACEHOLDER": "Sök kontakter",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Laddar kontakter...",
       "404": "Inga kontakter matchar din sökning 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/sv/contactFilters.json b/app/javascript/dashboard/i18n/locale/sv/contactFilters.json
index 61b04ee4e..1f0e25fd9 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Namn",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefonnummer",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Egna egenskaper"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 090d97102..2bf23d8a1 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Laddar konversationer",
     "CANNOT_REPLY": "Du kan inte svara på grund av",
     "24_HOURS_WINDOW": "24 timmars meddelandebegränsning",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "Du kan bara svara på denna konversation med ett mallmeddelande på grund av",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 timmars meddelandebegränsning",
     "SELECT_A_TWEET_TO_REPLY": "Välj en tweet att svara på.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Filen överskrider gränsen för {MAXIMUM_FILE_UPLOAD_SIZE} bifogade filer",
     "MESSAGE_ERROR": "Det gick inte att skicka detta meddelande, försök igen senare",
     "SENT_BY": "Skickat av:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Välj agent",
       "REMOVE": "Radera",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Bjud in dina teammedlemmar",
-      "DESCRIPTION": "Eftersom du är redo att prata med din kund, ta in dina lagkamrater för att hjälpa dig. Du kan bjuda in dina lagkamrater genom att lägga till deras e-postadress i agentlistan.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 830923c26..a5c2be975 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Antal dagar till ett ärende ska automatlösas på grund av inaktivitet",
         "PLACEHOLDER": "30",
-        "ERROR": "Ange en giltig tid för automatlösning (minst 1 dag)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Konversationskontinuitet med e-post är aktiverat för ditt konto.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index fbe9c92e8..0e6c974fb 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Aktivera kanalhälsning",
-          "HELP_TEXT": "Skicka ett hälsningsmeddelande till användaren när hen startar konversationen.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Aktiverad",
           "DISABLED": "Inaktiverad"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Detta fält är obligatoriskt"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Detta fält är obligatoriskt"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Detta fält är obligatoriskt"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Detta fält är obligatoriskt"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inkorgsnamn",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Detta fält är obligatoriskt"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefonnummer",
+            "PLACEHOLDER": "Ange telefonnummer från vilket meddelande som ska skickas.",
+            "ERROR": "Ange ett giltigt värde. Telefonnummer bör börja med `+`-tecken."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback-URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Aktiverad",
         "DISABLED": "Inaktiverad"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Aktiverad",
+        "DISABLED": "Inaktiverad"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Aktiverad",
+        "DISABLED": "Inaktiverad"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Aktivera"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Aktivera automatisk tilldelning",
       "ENABLE_CSAT": "Aktivera CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Aktivera/inaktivera CSAT(kundnöjdhet) undersökning efter att ha löst ett samtal",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Inkorgsinställningar",
       "INBOX_UPDATE_SUB_TEXT": "Uppdatera inställningarna för din inkorg",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivera eller inaktivera automatisk tilldelning av nya konversationer till de agenter som lagts till den här inkorgen.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Identifierare för inkorgen",
       "INBOX_IDENTIFIER_SUB_TEXT": "Använd `inbox_identifier`-token som visas här för att autentisera dina API-klienter.",
       "FORWARD_EMAIL_TITLE": "Vidarebefordra till e-post",
-      "FORWARD_EMAIL_SUB_TEXT": "Börja vidarebefordra dina e-postmeddelanden till följande e-postadress."
+      "FORWARD_EMAIL_SUB_TEXT": "Börja vidarebefordra dina e-postmeddelanden till följande e-postadress.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Återauktorisera",
diff --git a/app/javascript/dashboard/i18n/locale/sv/index.js b/app/javascript/dashboard/i18n/locale/sv/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/sv/index.js
+++ b/app/javascript/dashboard/i18n/locale/sv/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 364c4a586..973cad51f 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Lösenord",
+        "LABEL": "New password",
         "ERROR": "Ange ett lösenord med minst 6 tecken",
         "PLACEHOLDER": "Ange ett nytt lösenord"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Bekräfta nytt lösenord",
         "ERROR": "Bekräfta lösenord måste matcha lösenordet",
-        "PLACEHOLDER": "Ange ditt lösenord igen"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Egna egenskaper",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
index a2050dc55..4296d57f8 100644
--- a/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json
index 2d308dd8a..dfe05b936 100644
--- a/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "நிலை",
@@ -31,7 +33,54 @@
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Custom Attributes"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "ரத்துசெய்",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Yes, Delete",
+            "NO": "இல்லை, அதை வைத்திரு"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/automation.json b/app/javascript/dashboard/i18n/locale/ta/automation.json
index c3614a990..64ebe4812 100644
--- a/app/javascript/dashboard/i18n/locale/ta/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "செயல்கள்"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "பெயர்",
+        "Description",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "CONFIRM": {
+        "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+        "MESSAGE": "நீக்குவதில் உறுதியாக உள்ளீர்களா ",
+        "YES": "ஆம், நீக்கு ",
+        "NO": "இல்லை, வைத்திரு "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "திருத்து",
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "திருத்து",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "ரத்துசெய்",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json
index d36521132..ba64faa4d 100644
--- a/app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "பதிவு செய்யப்பட்ட பதில்களை சேர்க்க",
     "LOADING": "பதிவு செய்யப்பட்ட பதில்களைப் பெற",
     "SEARCH_404": "இந்த கேள்விக்கு பொருந்தக்கூடியவை எதுவும் இல்லை",
-    "SIDEBAR_TXT": "<p> <b> பதிவு செய்யப்பட்ட பதில்கள் </b> </p> <p> பதிவு செய்யப்பட்ட பதில்கள் சேமிக்கப்பட்ட பதில் மாதிரிகளாக சேமிக்கப்படுகின்றன, அவை உரையாடலுக்கு விரைவாக பதிலை அனுப்ப பயன்படும். </p> <p> பதிவு செய்யப்பட்ட பதிலை உருவாக்க, <b> பதிவு செய்யப்பட்ட பதிலைச் சேர் </b> என்பதைக் கிளிக் செய்யவும். திருத்து என்பதைக் கிளிக் செய்வதன் மூலம் ஏற்கனவே உள்ள பதிவு செய்யப்பட்ட பதிலைத் திருத்தலாம் அல்லது நீக்கலாம்</p> <p> பதிவு செய்யப்பட்ட பதில்கள் <b>குறுகிய குறியீடுகள் </b> உதவியுடன் பயன்படுத்தப்படுகின்றன. அரட்டையில் இருக்கும்போது முகவர்கள் பதிவு செய்யப்பட்ட பதில்களை <b> '/' </b> எனத் தட்டச்சு செய்வதன் மூலம் குறுகிய குறியீட்டை அணுகலாம். </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "இந்த கணக்கில் பதிவு செய்யப்பட்ட பதில்கள் எதுவும் இல்லை.",
       "TITLE": "பதிவு செய்யப்பட்ட பதில்களை நிர்வகிக்கவும்",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "பதிவு செய்யப்பட்ட பதில்களை சேர்க்க",
-      "DESC": "பதிவு செய்யப்பட்ட பதில்கள் சேமிக்கப்பட்ட பதில்கலாக மாறி உரையாடலுக்கு விரைவாக பதிலை அனுப்ப பயன்படும்.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "குறுகிய குறியீடு",
-          "PLACEHOLDER": "ஷார்ட் கோடை உள்ளிடவும்",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "ஷார்ட் கோடு தேவை"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index 636ee3ae3..0c2370da0 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "ரத்துசெய்",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "காண்க",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "வடிகட்டவும்",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/ta/contactFilters.json b/app/javascript/dashboard/i18n/locale/ta/contactFilters.json
index a5ff63782..9c19fdff8 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "பெயர்",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "தொலைபேசி எண்",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index c7426491d..c911657f5 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "மேலும் உரையாடல்களை ஏற்றுகிறோம்",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "நீக்கு",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 4fa58f4cd..7043e793c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "சேனல் வாழ்த்தை இயக்கு",
-          "HELP_TEXT": "உரையாடலைத் தொடங்கும்போது பயனருக்கு வாழ்த்துச் செய்தியை அனுப்பவும்.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "இயக்கப்பட்டது",
           "DISABLED": "முடக்கப்பட்டது"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "இந்த புலம் தேவை"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "இந்த புலம் தேவை"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "இந்த புலம் தேவை"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "இந்த புலம் தேவை"
+          },
+          "INBOX_NAME": {
+            "LABEL": "இன்பாக்ஸ் பெயர்",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "இந்த புலம் தேவை"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "தொலைபேசி எண்",
+            "PLACEHOLDER": "செய்தி அனுப்பப்படும் தொலைபேசி எண்ணை உள்ளிடவும்.",
+            "ERROR": "சரியான நம்பரை உள்ளிடவும். தொலைபேசி எண் `+` அடையாளத்துடன் தொடங்க வேண்டும்."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "கால்பேக் URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "இயக்கப்பட்டது",
         "DISABLED": "முடக்கப்பட்டது"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "இயக்கப்பட்டது",
+        "DISABLED": "முடக்கப்பட்டது"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "இயக்கப்பட்டது",
+        "DISABLED": "முடக்கப்பட்டது"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "தானாக ஒதுக்கீட்டை இயக்கு",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "இன்பாக்ஸ் அமைப்புகள்",
       "INBOX_UPDATE_SUB_TEXT": "உங்கள் இன்பாக்ஸ் அமைப்புகளைப் புதுப்பிக்கவும்",
       "AUTO_ASSIGNMENT_SUB_TEXT": "இந்த இன்பாக்ஸில் சேர்க்கப்பட்ட ஏஜென்ட்களுக்கு புதிய உரையாடல்களின் தானியங்கி ஒதுக்கீட்டை இயக்கவும் அல்லது முடக்கவும்.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address."
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "மறு அங்கீகாரம்",
diff --git a/app/javascript/dashboard/i18n/locale/ta/index.js b/app/javascript/dashboard/i18n/locale/ta/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/ta/index.js
+++ b/app/javascript/dashboard/i18n/locale/ta/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index c7e69537a..01c2d4c8e 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "பாஸ்வேர்ட்",
+        "LABEL": "New password",
         "ERROR": "6 அல்லது அதற்கு மேற்பட்ட நீள பாஸ்வேர்டை உள்ளிடவும்",
         "PLACEHOLDER": "புதிய பாஸ்வேர்டை உள்ளிடவும்"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "புதிய பாஸ்வேர்டை உறுதிப்படுத்தவும்",
         "ERROR": "பாஸ்வேர்டு ஒன்றோடு ஒன்று ஒத்துபோகும்படி இருக்கிறதா என்பதை உறுதிப்படுத்தவும்",
-        "PLACEHOLDER": "உங்கள் பாஸ் வேர்டை மீண்டும் உள்ளிடவும்"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Custom Attributes",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
index 64a1ebbf4..7b61f6ad8 100644
--- a/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/th/advancedFilters.json b/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
index 196792a1f..6fac74ae0 100644
--- a/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "สถานะ",
@@ -31,7 +33,54 @@
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "ยกเลิก",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "ยืนยันการลบ",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "เอาเลย",
+            "NO": "No, Keep it"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/automation.json b/app/javascript/dashboard/i18n/locale/th/automation.json
index c3614a990..c0c0d25fe 100644
--- a/app/javascript/dashboard/i18n/locale/th/automation.json
+++ b/app/javascript/dashboard/i18n/locale/th/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "สร้าง",
+      "CANCEL_BUTTON_TEXT": "ยกเลิก",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "การกระทำ"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "ชื่อ",
+        "Description",
+        "ใช้งานอยู่",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "ลบ",
+      "CANCEL_BUTTON_TEXT": "ยกเลิก",
+      "CONFIRM": {
+        "TITLE": "ยืนยันการลบ",
+        "MESSAGE": "คุณต้องการที่จะลบไหม ",
+        "YES": "เอาเลย ",
+        "NO": "ไม่อะเก็บไว้ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "เเก้ไข",
+      "CANCEL_BUTTON_TEXT": "ยกเลิก",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "เเก้ไข",
+      "CREATE": "สร้าง",
+      "DELETE": "ลบ",
+      "CANCEL": "ยกเลิก",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/campaign.json b/app/javascript/dashboard/i18n/locale/th/campaign.json
index 2f8d77580..78fa274b2 100644
--- a/app/javascript/dashboard/i18n/locale/th/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/th/campaign.json
@@ -3,8 +3,8 @@
     "HEADER": "แคมเปญ",
     "SIDEBAR_TXT": "ข้อความที่ช่วยให้ลูกค้าสามารถส่งข้อควาไปยังผู้ติดต่อซึ่งจะทำให้เกิดการสนทนามากขึ้น คลิกที่ <b> เพิ่มแคมเปญ </b> เพื่อสร้างแคมเปญใหม่ คุณยังสามารถแก้ไขหรือลบแคมเปญที่มีอยู่ได้โดยคลิกที่ปุ่มแก้ไขหรือลบ",
     "HEADER_BTN_TXT": {
-      "ONE_OFF": "Create a one off campaign",
-      "ONGOING": "Create a ongoing campaign"
+      "ONE_OFF": "สร้างแคมเปญแบบครั้งเดียว",
+      "ONGOING": "สร้างแคมเปญแบบต่อเนื่อง"
     },
     "ADD": {
       "TITLE": "สร้างแคมเปญใหม่",
@@ -18,20 +18,20 @@
           "ERROR": "โปรดระบุหัวข้อด้วย"
         },
         "SCHEDULED_AT": {
-          "LABEL": "Scheduled time",
-          "PLACEHOLDER": "Please select the time",
-          "CONFIRM": "Confirm",
-          "ERROR": "Scheduled time is required"
+          "LABEL": "ตารางเวลา",
+          "PLACEHOLDER": "กรุณาระบุเวลา",
+          "CONFIRM": "ยืนยัน",
+          "ERROR": "กำหนดเวลา"
         },
         "AUDIENCE": {
-          "LABEL": "Audience",
-          "PLACEHOLDER": "Select the customer labels",
-          "ERROR": "Audience is required"
+          "LABEL": "เป้าหมาย",
+          "PLACEHOLDER": "เลือกป้ายชื่อลูกค้า",
+          "ERROR": "จำเป็นต้องระบุเป้าหมาย"
         },
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox",
-          "ERROR": "Inbox is required"
+          "LABEL": "เลือกกล่องข้อความ",
+          "PLACEHOLDER": "เลือกกล่องข้อความ",
+          "ERROR": "จำเป็นต้องมีกล่องข้อความ"
         },
         "MESSAGE": {
           "LABEL": "ข้อความ",
@@ -54,7 +54,7 @@
           "ERROR": "กรุณาระบุเวลาที่อยู่ในหน้านั้นด้วย"
         },
         "ENABLED": "เปิดเเคมเปญ",
-        "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
+        "TRIGGER_ONLY_BUSINESS_HOURS": "เรียกเฉพาะในเวลาทำการ",
         "SUBMIT": "เพิ่มเเคมเปญ"
       },
       "API": {
@@ -71,8 +71,8 @@
         "NO": "ไม่อะเก็บไว้ "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Campaign deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+        "SUCCESS_MESSAGE": "ลบแคมเปญเรียบร้อยแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง."
       }
     },
     "EDIT": {
@@ -93,7 +93,7 @@
         "STATUS": "สถานะ",
         "SENDER": "ผู้ส่ง",
         "URL": "ลิ้ง",
-        "SCHEDULED_AT": "Scheduled time",
+        "SCHEDULED_AT": "ตารางเวลา",
         "TIME_ON_PAGE": "เวลา (วินาที)",
         "CREATED_AT": "สร้างเมื่อ"
       },
@@ -105,22 +105,22 @@
       "STATUS": {
         "ENABLED": "เปิด",
         "DISABLED": "ปิด",
-        "COMPLETED": "Completed",
-        "ACTIVE": "Active"
+        "COMPLETED": "เสร็จสิ้น",
+        "ACTIVE": "ใช้งานอยู่"
       },
       "SENDER": {
         "BOT": "บอท"
       }
     },
     "ONE_OFF": {
-      "HEADER": "One off campaigns",
-      "404": "There are no one off campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an sms inbox and start adding campaigns"
+      "HEADER": "แคมเปญเดียว",
+      "404": "ยังไม่มีใครสร้างแคมเปญ",
+      "INBOXES_NOT_FOUND": "โปรดสร้างกล่องข้อความ SMS และเพิ่มแคมเปญ"
     },
     "ONGOING": {
-      "HEADER": "Ongoing campaigns",
-      "404": "There are no ongoing campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+      "HEADER": "แคมเปญต่อเนื่อง",
+      "404": "ไม่มีการสร้างแคมเปญต่อเนื่อง",
+      "INBOXES_NOT_FOUND": "โปรดสร้างกล่องข้อความของเว็บไซต์ และเพิ่มแคมเปญ"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json
index 65c119b02..1e05e4ae6 100644
--- a/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "เพิ่มคำตอบสำเร็จรูป",
     "LOADING": "กำลังดึงการตอบสำเร็จรูป",
     "SEARCH_404": "ไม่มีรายการที่ตรงกับเนื้อหานี้",
-    "SIDEBAR_TXT": "<p> <b> การตอบกลับสำเร็จรูป </b> </p> <p> คำตอบสำเร็จรูปคือเทมเพลตการตอบกลับที่บันทึกไว้ซึ่งสามารถใช้เพื่อตอบกลับการสนทนาได้อย่างรวดเร็ว </p> <p> สำหรับการสร้างคำตอบสำเร็จรูปเพียงคลิกที่ <b> เพิ่มการตอบกลับสำเร็จรูป </b> คุณยังสามารถแก้ไขหรือลบคำตอบสำเร็จรูปที่มีอยู่ได้โดยคลิกที่ปุ่มแก้ไขหรือลบ </p> <p> คำตอบสำเร็จรูปถูกใช้โดยใช้ <b> รหัสย่อ </b> ตัวแทนสามารถเข้าถึงคำตอบสำเร็จรูปขณะสนทนาได้โดยพิมพ์ <b> '/' </b> ตามด้วยรหัสสั้น ๆ </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "ไม่มีการตอบสำเร็จรูปในบัญชีนี้",
       "TITLE": "จัดกาาคำตอบสำเร็จรูป",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "เพิ่มคำตอบสำเร็จรูป",
-      "DESC": "คำตอบสำเร็จรูปคือเทมเพลตการตอบกลับที่กำหนดไว้ล่วงหน้าซึ่งสามารถใช้เพื่อส่งการตอบกลับไปยังตั๋วได้อย่างรวดเร็ว",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "ยกเลิก",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "หรัสสั้นๆ",
-          "PLACEHOLDER": "กรุณากรอกหรัสสั่นๆ",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "จำเป็นต้องระบุหรัสสั่น"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index bf618da6f..29cd522c7 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -33,8 +33,8 @@
         "NO_RESULT": "ไม่พบหัวข้อ"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
+    "MERGE_CONTACT": "รวมผู้ติดต่อเข้าด้วยกัน",
+    "CONTACT_ACTIONS": "ดำเนินการติดต่อ",
     "MUTE_CONTACT": "ระงับการสนทนา",
     "UNMUTE_CONTACT": "เลิกใบ้การสนทนา",
     "MUTED_SUCCESS": "การสนทนานี้ถูกระงับ 6 ชั่วโมง",
@@ -58,32 +58,32 @@
     "DESC": "เพิ่าข้อความพื้นฐานเกี่ยวกับการติดต่อนี้"
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "Import",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "BUTTON_LABEL": "นำเข้า",
+    "TITLE": "นำเข้าผู้ติดต่อ",
+    "DESC": "นำเข้ารายชื่อผู้ติดต่อผ่านไฟล์ CSV",
+    "DOWNLOAD_LABEL": "ดาวน์โหลดตัวอย่าง csv",
     "FORM": {
-      "LABEL": "CSV File",
-      "SUBMIT": "Import",
+      "LABEL": "ไฟล์ CSV",
+      "SUBMIT": "นำเข้า",
       "CANCEL": "ยกเลิก"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "บันทึกรายชื่อเรียบร้อยแล้ว",
     "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
   },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "ลบผู้ติดต่อ",
+    "TITLE": "ลบผู้ติดต่อ",
+    "DESC": "ลบรายละเอียดผู้ติดต่อ",
     "CONFIRM": {
       "TITLE": "ยืนยันการลบ",
       "MESSAGE": "คุณต้องการที่จะลบไหม ",
-      "PLACE_HOLDER": "Please type {contactName} to confirm",
+      "PLACE_HOLDER": "กรุณาพิมพ์ {contactName} เพื่อยืนยัน",
       "YES": "เอาเลย ",
       "NO": "ไม่อะเก็บไว้ "
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "ลบผู้ติดต่อเรียบร้อยแล้ว",
+      "ERROR_MESSAGE": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง."
     }
   },
   "CONTACT_FORM": {
@@ -111,7 +111,7 @@
         "LABEL": "หมายเลขโทรศัพท์",
         "HELP": "เบอร์โทรศัพท์ควรจะเป็นเเบบนี้เช่น +663990214 [+][หรัสประเทศ][หรัสพื้นที่][เลขโทรศัพท์]",
         "ERROR": "หมายเลขโทรศัพท์ควรจะว่างปล่าวหรืออยู่ในรู้เเบบ E.164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "หมายเลขนี้ถูกใช้ในผู้ติดต่อคนอื่นเเล้ว"
       },
       "LOCATION": {
         "PLACEHOLDER": "กรอกที่อยู่ผู้ติดต่อ",
@@ -157,9 +157,9 @@
         "ERROR": "เลือกกล่องข้อความ"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "หัวเรื่อง",
+        "PLACEHOLDER": "หัวเรื่อง",
+        "ERROR": "หัวเรื่องไม่สามารถเว้นว่างได้"
       },
       "MESSAGE": {
         "LABEL": "ข้อความ",
@@ -169,6 +169,7 @@
       "SUBMIT": "ส่วข้อความ",
       "CANCEL": "ยกเลิก",
       "SUCCESS_MESSAGE": "ส่งข้อความเเล้ว",
+      "GO_TO_CONVERSATION": "View",
       "ERROR_MESSAGE": "ไม่สามารถส่งข้อความได้กรุณาลองอีกครั้ง"
     }
   },
@@ -177,7 +178,9 @@
     "FIELDS": "ฟิลส์ผู้ติดต่อ",
     "SEARCH_BUTTON": "ค้นหา",
     "SEARCH_INPUT_PLACEHOLDER": "ค้อนหาผู้ติดต่อ",
-    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS": "กรอง",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "กำลังโหลดรายชื่อผู้ติดต่อ",
       "404": "ไม่มีผู้ติดต่อที่ตรงกัน 🔍",
@@ -198,7 +201,7 @@
   },
   "CONTACT_PROFILE": {
     "BACK_BUTTON": "ผู้ติดต่อ",
-    "LOADING": "Loading contact profile..."
+    "LOADING": "กำลังโหลดโปรไฟล์ผู้ติดต่อ..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
@@ -211,13 +214,13 @@
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "กำลังเรียกบันทึก...",
+    "NOT_AVAILABLE": "ไม่มีข้อความที่สร้างขึ้นสำหรับผู้ติดต่อรายนี้",
     "HEADER": {
       "TITLE": "โน้ต"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "เพิ่มข้อความ"
     },
     "ADD": {
       "BUTTON": "เพิ่ม",
@@ -225,7 +228,7 @@
       "TITLE": "Shift + Enter เพื่อสร้างโน็ต"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "ลบข้อความ"
     }
   },
   "EVENTS": {
@@ -239,14 +242,14 @@
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
+    "ADD_BUTTON_TEXT": "เพิ่มแอตทริบิวต์",
     "BUTTON": "เพิ่มแอตทริบิวต์เเบบกำหนดเอง",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "NOT_AVAILABLE": "ไม่มีแอตทริบิวต์ที่กำหนดเองสำหรับผู้ติดต่อรายนี้",
     "COPY_SUCCESSFUL": "คัดลอกไปยังคริปบอร์ดเเล้ว",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "คัดลอกแอตทริบิวต์",
+      "DELETE": "ลบแอตทริบิวต์",
+      "EDIT": "แก้ไขแอตทริบิวต์"
     },
     "ADD": {
       "TITLE": "สร้างแอตทริบิวต์เเบบกำหนดเอง",
@@ -265,55 +268,55 @@
         "PLACEHOLDER": "ตัวอย่าง: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "TITLE": "สร้างแอตทริบิวต์ใหม่ ",
+        "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
+        "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
+        "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "ทำการลบเรียบร้อย",
+        "ERROR": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "เพิ่มแอตทริบิวต์",
+        "PLACEHOLDER": "ค้นหาแอตทริบิวต์",
+        "NO_RESULT": "ไม่พบข้อมูล"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "เลือกค่า",
+          "SEARCH_INPUT_PLACEHOLDER": "ค้นหาค่า",
+          "NO_RESULT": "ไม่พบผลการค้นหา"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "กรุณาระบุค่าที่ถูกต้อง",
+      "INVALID_URL": "URL ไม่ถูกต้อง"
     }
   },
   "MERGE_CONTACTS": {
     "TITLE": "รวมผู้ติดต่อเข้าด้วยกัน",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "DESCRIPTION": "รวมรายชื่อติดต่อเพื่อรวมสองโปรไฟล์เข้าด้วยกัน รวมทั้งแอตทริบิวต์และการสนทนาทั้งหมด ในกรณีที่มีข้อขัดแย้ง แอตทริบิวต์ของผู้ติดต่อหลักจะมีความสำคัญเหนือกว่า",
     "PRIMARY": {
       "TITLE": "ผู้ติดต่อหลัก",
-      "HELP_LABEL": "To be kept"
+      "HELP_LABEL": "เก็บไว้"
     },
     "CHILD": {
       "TITLE": "ผู้ติดต่อที่จะรวมเข้าด้วยกัน",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "PLACEHOLDER": "ค้นหาผู้ติดต่อ",
+      "HELP_LABEL": "ที่จะถูกลบ"
     },
     "SUMMARY": {
       "TITLE": "สรุปผล",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
+      "DELETE_WARNING": "ผู้ติดต่อ <strong>%{childContactName}</strong>จะถูกลบออก",
       "ATTRIBUTE_WARNING": "ข้อมูลผู้ติดต่อของ <strong>%{childContactName}</strong> จะถูกคัดลอกไปยัง <strong>%{primaryContactName}</strong>"
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR": "ข้อความผิดพลาด"
     },
     "FORM": {
       "SUBMIT": " รวมผู้ติดต่อเข้าด้วยกัน",
@@ -322,7 +325,7 @@
         "ERROR": "เลือกผู้ติดต่อที่จะรวมเข้าด้วยกัน"
       },
       "SUCCESS_MESSAGE": "รวมผู้ติดต่อเข้าด้วยกันเรียบร้อยเเล้ว",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "ERROR_MESSAGE": "ไม่สามารถรวมผู้ติดต่อได้ ลองใหม่อีกครั้งด้วยนะ!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/contactFilters.json b/app/javascript/dashboard/i18n/locale/th/contactFilters.json
index 52e7f9885..f9a11a6dd 100644
--- a/app/javascript/dashboard/i18n/locale/th/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/th/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "ชื่อ",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "หมายเลขโทรศัพท์",
             "IDENTIFIER": "Identifier",
             "CITY": "เมือง",
-            "COUNTRY": "ประเทศ"
+            "COUNTRY": "ประเทศ",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index b492a067f..4d89fee86 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "กรุณาเลือกการสนทนาจากด้านซ้าย",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "UNVERIFIED_SESSION": "ข้อมูลประจำตัวของผู้ใช้รายนี้ยังไม่ได้รับการยืนยัน",
     "NO_MESSAGE_1": "โอ้ว ไม่นะเหมือนจะไม่มีข้อความจากลูกค้าของคุณในกล่องข้อความ",
     "NO_MESSAGE_2": " เพื่อส่งข้อความไปยังเพจของคุณ!",
     "NO_INBOX_1": "โฮล่า! ดูเหมือนว่าคุณยังไม่ได้เพิ่มกล่องจดหมายเลยนะ",
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "กำลังโหลดการสนทนา",
     "CANNOT_REPLY": "คุณไม่สามารถตอบกลับได้เนื่องจาก",
     "24_HOURS_WINDOW": "การจำกัดหน้าต่างข้อความ 24 ชั่วโมง",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "มอบหมายให้ฉัน",
     "TWILIO_WHATSAPP_CAN_REPLY": "คุณสามารถตอบกลับการสนทนานี้ได้โดยการใช้เเม่เเบบเวลาที่กำหนด",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "การจำกัดหน้าต่างข้อความ 24 ชั่วโมง",
     "SELECT_A_TWEET_TO_REPLY": "กรุณาเลือกทวีตที่ต้อวการติบกลับ",
@@ -41,9 +43,9 @@
       "OPEN": "เพิ่มเติม",
       "CLOSE": "ปิด",
       "DETAILS": "รายละเอียด",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_TOMORROW": "ปิดการแจ้งเตือนจนถึงพรุ่งนี้",
+      "SNOOZED_UNTIL_NEXT_WEEK": "ปิดการแจ้งเตือนจนถึงอาทิตย์หน้า",
+      "SNOOZED_UNTIL_NEXT_REPLY": "ปิดการแจ้งเตือนจนการตอบกลับถัดไป"
     },
     "RESOLVE_DROPDOWN": {
       "MARK_PENDING": "ทำเครื่องหมายว่าอยู่ระหว่างการรอ",
@@ -79,7 +81,7 @@
         "BCC": {
           "LABEL": "BCC",
           "PLACEHOLDER": "อีเมล์ถูกเเยกโดยคอมม่า",
-          "ERROR": "กรุณากรอกอีเมล์มห้ถูกต้อง"
+          "ERROR": "กรุณากรอกอีเมล์ให้ถูกต้อง"
         }
       }
     },
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "ไฟล์ใหเกินกว่า {MAXIMUM_FILE_UPLOAD_SIZE} ที่กำหนดไว้",
     "MESSAGE_ERROR": "ไม่สามารถส่งข้อความนี้ได้ กรุณาลองใหม่อีกครั้ง",
     "SENT_BY": "ส่งโดย:",
+    "BOT": "บอท",
+    "SEND_FAILED": "ไม่สามารถส่งข้อความได้กรุณาลองอีกครั้ง",
+    "TRY_AGAIN": "กรุณาลองอีกครั้ง",
     "ASSIGNMENT": {
       "SELECT_AGENT": "เลือกพนักงาน",
       "REMOVE": "ลบออก",
@@ -132,7 +137,7 @@
     },
     "INBOXES": {
       "TITLE": "เชื่อมต่อกล่องข้อความ",
-      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "DESCRIPTION": "เชื่อมต่อช่องทางต่างๆ ที่ลูกค้าของคุณจะพูดคุยกับคุณ อาจเป็นเว็บไซต์แชทสด หน้า Facebook หรือ Twitter ของคุณ หรือแม้แต่หมายเลข WhatsApp ของคุณ",
       "NEW_LINK": "คลิกที่นี่เพื่อสร้างกล่องข้อความ"
     },
     "LABELS": {
@@ -142,46 +147,46 @@
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
-    "TEAM_LABEL": "Assigned Team",
+    "ASSIGNEE_LABEL": "ตัวแทนที่ได้รับมอบหมาย",
+    "SELF_ASSIGN": "มอบหมายให้ฉัน",
+    "TEAM_LABEL": "ทีมที่ได้รับมอบหมาย",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "ไม่มี"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
-      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONTACT_DETAILS": "รายละเอียดการติดต่อ",
+      "CONVERSATION_ACTIONS": "การดำเนินการสนทนา",
       "CONVERSATION_LABELS": "ป้ายกำกับการสนทนา",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONVERSATION_INFO": "ข้อมูลการสนทนา",
+      "CONTACT_ATTRIBUTES": "แอตทริบิวต์การติดต่อ",
       "PREVIOUS_CONVERSATION": "การสนทนาก่อนหน้า"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "สร้างแอตทริบิวต์",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
+      "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
     },
     "ADD": {
       "TITLE": "เพิ่ม",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
+      "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "ทำการลบเรียบร้อย",
+      "ERROR": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "เพิ่มแอตทริบิวต์",
+      "PLACEHOLDER": "ค้นหาแอตทริบิวต์",
+      "NO_RESULT": "ไม่พบข้อมูล"
     }
   },
   "EMAIL_HEADER": {
     "TO": "ถึง",
-    "BCC": "Bcc",
-    "CC": "Cc",
-    "SUBJECT": "Subject"
+    "BCC": "สำเนาลับ",
+    "CC": "สำเนา",
+    "SUBJECT": "หัวเรื่อง"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index e5ce1ddab..653e51fd1 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "เปิดข้อความต้อนรับ",
-          "HELP_TEXT": "ส่งข้อความต้นรับเมื่อการสนทนาเริ่มขึ้น",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "เปิด",
           "DISABLED": "ปิด"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
+          },
+          "INBOX_NAME": {
+            "LABEL": "ชื่อกล่องข้อความ",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "หมายเลขโทรศัพท์",
+            "PLACEHOLDER": "กรุณากรอกหมายเลขโทรศัพท์ที่จะส่งข้อความ",
+            "ERROR": "กรุณากรอกหมายเลขโทรศัพท์ให้ถูกต้องต้องเริ่มด้วย \"+\""
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "ลิ้งเรียกกลับ",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "เปิด",
         "DISABLED": "ปิด"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "เปิด",
+        "DISABLED": "ปิด"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "เปิด",
+        "DISABLED": "ปิด"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Enable auto assignment",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Inbox Settings",
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "เริ่มนำเข้าอีเมล์ของคุณไปที่อยู่อีเมล์"
+      "FORWARD_EMAIL_SUB_TEXT": "เริ่มนำเข้าอีเมล์ของคุณไปที่อยู่อีเมล์",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reauthorize",
diff --git a/app/javascript/dashboard/i18n/locale/th/index.js b/app/javascript/dashboard/i18n/locale/th/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/th/index.js
+++ b/app/javascript/dashboard/i18n/locale/th/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 9d2458d35..96b74e1e5 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -31,7 +31,7 @@
       "AUDIO_NOTIFICATIONS_SECTION": {
         "TITLE": "Audio Notifications",
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
-        "NONE": "None",
+        "NONE": "ไม่มี",
         "ASSIGNED": "Assigned Conversations",
         "ALL_CONVERSATIONS": "All Conversations"
       },
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "หรัสผ่าน",
+        "LABEL": "New password",
         "ERROR": "Please enter a password of length 6 or more",
         "PLACEHOLDER": "Please enter a new password"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirm new password",
         "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your password"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/th/teamsSettings.json b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
index fc58c74db..a625604fa 100644
--- a/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
index 4dcd4d721..28c21f3b1 100644
--- a/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Durum",
@@ -31,7 +33,54 @@
       "LABELS": "Etiketler",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Özel Nitelikler"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "İptal Et",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Silmeyi onayla",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Evet, Sil",
+            "NO": "Hayır, kalsın"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/automation.json b/app/javascript/dashboard/i18n/locale/tr/automation.json
index c3614a990..c7ef5f279 100644
--- a/app/javascript/dashboard/i18n/locale/tr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Yarat",
+      "CANCEL_BUTTON_TEXT": "İptal Et",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Açıklama",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Hareketler"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "İsim",
+        "Açıklama",
+        "Aktif",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Sil",
+      "CANCEL_BUTTON_TEXT": "İptal Et",
+      "CONFIRM": {
+        "TITLE": "Silmeyi onayla",
+        "MESSAGE": "Silmek istediğinize emin misiniz ?",
+        "YES": "Evet, Sil ",
+        "NO": "Hayır, Tut"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Düzenle",
+      "CANCEL_BUTTON_TEXT": "İptal Et",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Düzenle",
+      "CREATE": "Yarat",
+      "DELETE": "Sil",
+      "CANCEL": "İptal Et",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
index 97ad61bb8..154ca746d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Hazır Yanıt Ekle",
     "LOADING": "Hazır Yanıtlar Getiriliyor",
     "SEARCH_404": "Bu sorgu ile eşleşen öğe yok",
-    "SIDEBAR_TXT": "<p> <b> Hazır Yanıtlar </b> </p> <p> Hazır Yanıtlar, bir sohbete hızlı bir şekilde yanıt göndermek için kullanılabilen kaydedilmiş yanıt şablonlarıdır. </p> <p> Bir Hazır Yanıt oluşturmak için, <b> Hazır Yanıt Ekle </b> 'yi tıklamanız yeterlidir. Ayrıca, Düzenle veya Sil düğmesini tıklayarak mevcut bir Hazır Yanıtı düzenleyebilir veya silebilirsiniz </p> <p> Hazır yanıtlar, <b> Kısa Kodlar </b> yardımıyla kullanılır. Temsilciler, sohbet sırasında <b> '/' </b> ve ardından kısa kodu yazarak hazır yanıtlara erişebilir. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Bu hesapta hazır yanıt yok.",
       "TITLE": "Hazır yanıtları yönetin",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Hazır Yanıt Ekle",
-      "DESC": "Hazır Yanıtlar, sohbete hızlı bir şekilde yanıt göndermek için kullanılabilen kaydedilmiş yanıt şablonlarıdır.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "İptal Et",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Kısa kod",
-          "PLACEHOLDER": "Lütfen bir kısa kod girin",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Kısa Kod gerekli"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index adc6fef8d..154f26ca2 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Mesaj yolla",
       "CANCEL": "İptal Et",
       "SUCCESS_MESSAGE": "Mesaj yollandı!",
+      "GO_TO_CONVERSATION": "Görünüm",
       "ERROR_MESSAGE": "Yollanamıyor! lütfen tekrar deneyin"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Arama",
     "SEARCH_INPUT_PLACEHOLDER": "Kişileri arayın",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Kişiler yükleniyor ...",
       "404": "Aramanızla eşleşen kişi yok 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/tr/contactFilters.json b/app/javascript/dashboard/i18n/locale/tr/contactFilters.json
index 5925be841..991e3263b 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "İsim",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Telefon numarası",
             "IDENTIFIER": "Identifier",
             "CITY": "Şehir",
-            "COUNTRY": "Ülke"
+            "COUNTRY": "Ülke",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Özel Nitelikler"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 5d82463ff..167425712 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Loading Conversations\n",
     "CANNOT_REPLY": "Nedeniyle cevap veremezsiniz",
     "24_HOURS_WINDOW": "24 saat mesaj penceresi kısıtlaması",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 saat mesaj penceresi kısıtlaması",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Tarafından gönderildi:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Temsilci Seçin",
       "REMOVE": "Kaldır",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index c6b8f823e..9571549f0 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Etkinlik yoksa, bir biletin otomatik olarak çözülmesi gereken gün sayısı",
         "PLACEHOLDER": "30",
-        "ERROR": "Lütfen geçerli bir otomatik çözüm süresi girin (minimum 1 gün)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Hesabınız için e-postalarla görüşme sürekliliği etkinleştirildi.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 75da7631b..8b2dda18a 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Kanal karşılamasını etkinleştir",
-          "HELP_TEXT": "Kullanıcı konuşmayı başlattığında ona bir karşılama mesajı gönderin.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Etkin",
           "DISABLED": "Devre dışı"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Bu alan gereklidir"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Bu alan gereklidir"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Bu alan gereklidir"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Bu alan gereklidir"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Gelen Kutusu Adı",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Bu alan gereklidir"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Telefon numarası",
+            "PLACEHOLDER": "Lütfen mesajın gönderileceği telefon numarasını giriniz.",
+            "ERROR": "Lütfen geçerli bir değer girin. Telefon numarası '+' işaretiyle başlamalıdır."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Geri arama URL'si",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Etkin",
         "DISABLED": "Devre dışı"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Etkin",
+        "DISABLED": "Devre dışı"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Etkin",
+        "DISABLED": "Devre dışı"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Otomatik atamayı etkinleştir",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Gelen Kutusu Ayarları",
       "INBOX_UPDATE_SUB_TEXT": "Gelen kutusu ayarlarınızı güncelleyin",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bu gelen kutusuna eklenen aracılara yeni görüşmelerin otomatik olarak atanmasını etkinleştirin veya devre dışı bırakın.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "E-postalarınızı aşağıdaki e-posta adresine iletmeye başlayın."
+      "FORWARD_EMAIL_SUB_TEXT": "E-postalarınızı aşağıdaki e-posta adresine iletmeye başlayın.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Yeniden yetkilendir",
diff --git a/app/javascript/dashboard/i18n/locale/tr/index.js b/app/javascript/dashboard/i18n/locale/tr/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/tr/index.js
+++ b/app/javascript/dashboard/i18n/locale/tr/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 2268f3ab5..938010030 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Parola",
+        "LABEL": "New password",
         "ERROR": "Lütfen 6 veya daha uzun bir şifre girin",
         "PLACEHOLDER": "Lütfen yeni bir şifre girin"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Yeni şifreyi onayla",
         "ERROR": "Onay parolası, parolayla eşleşmelidir",
-        "PLACEHOLDER": "lütfen şifrenizi tekrar girin"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Özel Nitelikler",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
index f78cd0d28..122eadd06 100644
--- a/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
index a4fd4c156..4030882c2 100644
--- a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Статус",
@@ -31,7 +33,54 @@
       "LABELS": "Мітки",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Свої атрибути"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Назва обов'язкова",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Скасувати",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Підтвердження видалення",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Так, видалити",
+            "NO": "Ні, залиште"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/automation.json b/app/javascript/dashboard/i18n/locale/uk/automation.json
index c3614a990..7f3a64ce3 100644
--- a/app/javascript/dashboard/i18n/locale/uk/automation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Створити",
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Назва обов'язкова"
+        },
+        "DESC": {
+          "LABEL": "Опис",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Необхідний опис"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Будь ласка, виберіть",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Дії"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Ім'я",
+        "Опис",
+        "Активний",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Видалити",
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "CONFIRM": {
+        "TITLE": "Підтвердження видалення",
+        "MESSAGE": "Справді бажаєте видалити ",
+        "YES": "Так, видалити ",
+        "NO": "Ні, залишити "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Редагувати",
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Редагувати",
+      "CREATE": "Створити",
+      "DELETE": "Видалити",
+      "CANCEL": "Скасувати",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
index 1c653a81e..b45c565f9 100644
--- a/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Додати швидку відповідь",
     "LOADING": "Отримання швидких відповідей",
     "SEARCH_404": "Немає елементів, що відповідають запиту",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation . </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "В цьому обліковому записі немає швидких відповідей.",
       "TITLE": "Керування швидкими вдіповідями",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Додати швидку відповідь",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation .",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Короткий код",
-          "PLACEHOLDER": "Будь ласка, введіть короткий код",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Необхідно вказати короткий код"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 79cf24b5f..6cc3a1d8f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Надіслати",
       "CANCEL": "Скасувати",
       "SUCCESS_MESSAGE": "Повідомлення надіслано!",
+      "GO_TO_CONVERSATION": "Вигляд",
       "ERROR_MESSAGE": "Не вдалося надіслати! Повторіть спробу"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Пошук",
     "SEARCH_INPUT_PLACEHOLDER": "Пошук контактів",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Завантаження контактів...",
       "404": "Немає контактів, які відповідають вашому пошуку 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
index 022fa925c..92198b147 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Ім'я",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Номер телефону",
             "IDENTIFIER": "Identifier",
             "CITY": "Місто",
-            "COUNTRY": "Країна"
+            "COUNTRY": "Країна",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Свої атрибути"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 8b8e2ba2b..d642db45e 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Завантаження бесід",
     "CANNOT_REPLY": "You cannot reply due to",
     "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Призначити мені",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "Файл перевищує ліміт вкладення {MAXIMUM_FILE_UPLOAD_SIZE}",
     "MESSAGE_ERROR": "Не вдалося надіслати повідомлення, будь ласка, повторіть спробу пізніше",
     "SENT_BY": "Надіслав:",
+    "BOT": "Бот",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Виберіть агента",
       "REMOVE": "Видалити",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Запросити членів команди",
-      "DESCRIPTION": "Оскільки Ви готуєтеся поговорити зі своїм клієнтом, запросіть ваших партнерів по команді, щоб допомогти вам. Ви можете запросити ваших товаришів по команді, додавши їх адреси електронної пошти до списку співробітників.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Натисніть тут, щоб запросити учасника"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index e92703b20..c3262554b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Увімкнути вітання каналу",
-          "HELP_TEXT": "Привітання користувачу, коли він розпочинає розмову.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Увімкнено",
           "DISABLED": "Вимкнено"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS-канал через Twilio",
-        "DESC": "Розпочніть підтримувати клієнтів через SMS з Twilio інтеграцією."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Це поле є обов'язковим"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Це поле є обов'язковим"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Це поле є обов'язковим"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Це поле є обов'язковим"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Назва каналу",
+            "PLACEHOLDER": "Будь ласка, введіть назву каналу",
+            "ERROR": "Це поле є обов'язковим"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Номер телефону",
+            "PLACEHOLDER": "Будь ласка, введіть номер телефону, з якого будуть надсилатися повідомлення.",
+            "ERROR": "Номер телефону повинен починатися з символу `+'."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "Канал WhatsApp",
@@ -305,6 +353,14 @@
         "ENABLED": "Увімкнено",
         "DISABLED": "Вимкнено"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Увімкнено",
+        "DISABLED": "Вимкнено"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Увімкнено",
+        "DISABLED": "Вимкнено"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Увімкнути автопризначення",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Увімкнути/Вимкнути опитування CSAT(Задоволення клієнтів) після вирішення розмови",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Налаштування каналу",
       "INBOX_UPDATE_SUB_TEXT": "Оновіть параметри каналу",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Увімкнення або вимкнення автоматичного призначення нових розмов до агентів, доданих до цього каналу.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Ідентифікатор каналу",
       "INBOX_IDENTIFIER_SUB_TEXT": "Використовуйте токен `inbox_identifier`, показаний тут для аутентифікації ваших API клієнтів.",
       "FORWARD_EMAIL_TITLE": "Переслати на ел. пошту",
-      "FORWARD_EMAIL_SUB_TEXT": "Почніть перенаправляти листи до наступної адреси електронної пошти."
+      "FORWARD_EMAIL_SUB_TEXT": "Почніть перенаправляти листи до наступної адреси електронної пошти.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Повторна авторизація",
diff --git a/app/javascript/dashboard/i18n/locale/uk/index.js b/app/javascript/dashboard/i18n/locale/uk/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/uk/index.js
+++ b/app/javascript/dashboard/i18n/locale/uk/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 5e2b7050b..58156da8d 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Будь ласка, введіть поточний пароль"
       },
       "PASSWORD": {
-        "LABEL": "Пароль",
+        "LABEL": "New password",
         "ERROR": "Будь ласка, введіть пароль довжиною 6 або більше символів",
         "PLACEHOLDER": "Будь ласка, введіть новий пароль"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Підвердіть новий пароль",
         "ERROR": "Підтвердження пароля має відповідати паролю",
-        "PLACEHOLDER": "Введіть ваш пароль ще раз"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Свої атрибути",
     "AUTOMATION": "Automation",
     "TEAMS": "Команди",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Усі контакти",
     "TAGGED_WITH": "З тегами",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
index a5dc7c051..ba61d63e4 100644
--- a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Створити нову команду",
     "HEADER": "Команди",
-    "SIDEBAR_TXT": "<p><b>Команди</b></p> <p>Команди дозволяють організовувати своїх агентів в групи на основі їх обов'язків. <br /> Користувач може бути частиною декількох команд. Ви можете призначити розмови команді, коли працюєте спільно. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "В цьому обліковому запису не створено жодної команди.",
       "EDIT_TEAM": "Редагувати команду"
diff --git a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
index a0c8d73af..426785ab6 100644
--- a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "Trạng thái",
@@ -31,7 +33,54 @@
       "LABELS": "Nhãn",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "Huỷ",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "Xác nhận xoá",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "Có, Xoá",
+            "NO": "Không, Giữ"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/automation.json b/app/javascript/dashboard/i18n/locale/vi/automation.json
index c3614a990..93a32c9f2 100644
--- a/app/javascript/dashboard/i18n/locale/vi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "Tạo",
+      "CANCEL_BUTTON_TEXT": "Huỷ",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Mô tả",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "Hành động"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Tên",
+        "Mô tả",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "Xoá",
+      "CANCEL_BUTTON_TEXT": "Huỷ",
+      "CONFIRM": {
+        "TITLE": "Xác nhận xoá",
+        "MESSAGE": "Bạn có muốn xoá? ",
+        "YES": "Có, xoá ",
+        "NO": "Không, giữ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "Chỉnh sửa",
+      "CANCEL_BUTTON_TEXT": "Huỷ",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "Chỉnh sửa",
+      "CREATE": "Tạo",
+      "DELETE": "Xoá",
+      "CANCEL": "Huỷ",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
index 4e13e6765..9c6ac312d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Thêm thư mẫu phẩn hồi",
     "LOADING": "Đang tải thư mẫu phẩn hồi",
     "SEARCH_404": "Không có kết quả nào được tìm thấy",
-    "SIDEBAR_TXT": "<p><b>Thư mẫu phẩn hồi</b> </p><p> Thư mẫu phẩn hồi là các mẫu trả lời đã lưu có thể được sử dụng để nhanh chóng gửi trả lời cho một cuộc trò chuyện . </p><p> Để tạo một Thư mẫu phẩn hồi, chỉ cần click vào <b>Thêm Thư mẫu phẩn hồi</b>. Bạn cũng có thể xoá Thư mẫu phẩn hồi bởi button Xoá </p><p> Thư mẫu phẩn hồi được sử dụng với sự giúp đỡ của <b>Short Codes</b>. Nhân viên có thể truy cập câu trả lời soạn trước khi trò chuyện bằng cách nhập <b>'/'</b>. </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "Không có câu trả lời soạn trước nào có sẵn trong tài khoản này.",
       "TITLE": "Quản lý thư mẫu phẩn hồi",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Thêm thư mẫu phẩn hồi",
-      "DESC": "Thư mẫu phẩn hồi là các mẫu trả lời đã lưu có thể được sử dụng để nhanh chóng gửi trả lời cho cuộc trò chuyện.",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Short Code",
-          "PLACEHOLDER": "Vui lòng nhập một shortcode",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Short Code là bắt buộc"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 3398c5f95..a06bd3763 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "Huỷ",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "Xem",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/vi/contactFilters.json b/app/javascript/dashboard/i18n/locale/vi/contactFilters.json
index b53121101..6193867c4 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "Tên",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "Số Điện Thoại",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index 8d355e197..35c9d0023 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "Đang tải cuộc trò chuyện",
     "CANNOT_REPLY": "Bạn không thể trả lời do",
     "24_HOURS_WINDOW": "Giới hạn thời lượng tin nhắn 24 giờ",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Giới hạn thời lượng tin nhắn 24 giờ",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Xoá",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index ed2749b8f..6d456bfb5 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Bật lời chào kênh",
-          "HELP_TEXT": "Gửi tin nhắn chào mừng đến người dùng khi anh ta bắt đầu cuộc trò chuyện.",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "Bật",
           "DISABLED": "Không bật"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "Trường này là bắt buộc"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "Trường này là bắt buộc"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "Trường này là bắt buộc"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "Trường này là bắt buộc"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Tên hộp thư đến",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "Trường này là bắt buộc"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Số Điện Thoại",
+            "PLACEHOLDER": "Vui lòng nhập số điện thoại mà tin nhắn sẽ được gửi.",
+            "ERROR": "Vui lòng nhập một giá trị hợp lệ. Số điện thoại phải bắt đầu bằng `+`."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "Bật",
         "DISABLED": "Không bật"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Bật",
+        "DISABLED": "Không bật"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Bật",
+        "DISABLED": "Không bật"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "Bật tự động chuyển nhượng",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "Cài đặt Hộp thư đến",
       "INBOX_UPDATE_SUB_TEXT": "Cập nhật cài đặt hộp thư đến của bạn",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bật hoặc tắt tính năng tự động gán các cuộc hội thoại mới cho các tác nhân được thêm vào hộp thư đến này.",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Bắt đầu chuyển tiếp email của bạn tới địa chỉ email sau."
+      "FORWARD_EMAIL_SUB_TEXT": "Bắt đầu chuyển tiếp email của bạn tới địa chỉ email sau.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Ủy quyền lại",
diff --git a/app/javascript/dashboard/i18n/locale/vi/index.js b/app/javascript/dashboard/i18n/locale/vi/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/vi/index.js
+++ b/app/javascript/dashboard/i18n/locale/vi/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 907bd945f..e0d950b36 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "Mật khẩu",
+        "LABEL": "New password",
         "ERROR": "Vui lòng nhập mật khẩu có độ dài từ 6 trở lên",
         "PLACEHOLDER": "Vui lòng nhập mật khẩu mới"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Xác nhận mật khẩu mới",
         "ERROR": "Xác nhận mật khẩu phải khớp với mật khẩu",
-        "PLACEHOLDER": "Vui lòng nhập lại mật khẩu của bạn"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh",
     "AUTOMATION": "Automation",
     "TEAMS": "Nhóm",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
index 7b57fef9f..863eefabc 100644
--- a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Tạo nhóm mới",
     "HEADER": "Nhóm",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/zh/index.js b/app/javascript/dashboard/i18n/locale/zh/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/zh/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
index 2d87114e3..66ea3f448 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "状态",
@@ -31,7 +33,54 @@
       "LABELS": "标签",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "自定义属性"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "Name is required",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "取消",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "确认删除",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "是，删除",
+            "NO": "否，保留它"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
index c3614a990..0a5953617 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "创建",
+      "CANCEL_BUTTON_TEXT": "取消",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "描述信息",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "Description is required"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "操作"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "姓名：",
+        "描述信息",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "删除",
+      "CANCEL_BUTTON_TEXT": "取消",
+      "CONFIRM": {
+        "TITLE": "确认删除",
+        "MESSAGE": "您确定要删除吗？ ",
+        "YES": "是的，删除 ",
+        "NO": "不，保留 "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "编辑",
+      "CANCEL_BUTTON_TEXT": "取消",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "编辑",
+      "CREATE": "创建",
+      "DELETE": "删除",
+      "CANCEL": "取消",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
index dc9341a17..17790567e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "添加预设回复",
     "LOADING": "获取预设回复",
     "SEARCH_404": "没有任何项目符合此查询",
-    "SIDEBAR_TXT": "<p><b>预设回复</b> </p><p> 预设的回复已保存的回复模板，可以用来快速发送回复到对话。 </p><p> 若要创建预设反应，只需点击 <b>添加预设回应</b>。 您也可以通过点击编辑或删除按钮来编辑或删除现有的预定响应 </p><p> 在 <b>短代码</b>的帮助下使用预定的响应方式。 代理人在聊天时可以通过输入 <b>'/'</b> 然后是短代码访问预设响应 </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "此帐户中没有预设的回复。",
       "TITLE": "管理预设回复",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "添加预设回复",
-      "DESC": "预设的回复是保存的回复模板，可以用来快速发送回复到对话中。",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "取消操作",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "短码",
-          "PLACEHOLDER": "请输入短码",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "必须输入短代码"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 804bd7959..c052ac989 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "Send message",
       "CANCEL": "取消",
       "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "查看",
       "ERROR_MESSAGE": "Couldn't send! try again"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "搜索",
     "SEARCH_INPUT_PLACEHOLDER": "搜索联系人",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "正在加载联系人列表...",
       "404": "没有搜索到联系人🔍",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
index 2f8edb660..b97cc9bf3 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "姓名：",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "电话号码",
             "IDENTIFIER": "Identifier",
             "CITY": "City",
-            "COUNTRY": "Country"
+            "COUNTRY": "Country",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "自定义属性"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index c3afed466..fbd2840f2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "加载更多对话",
     "CANNOT_REPLY": "您不能回复，原因是：",
     "24_HOURS_WINDOW": "24 小时消息窗口限制",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 小时消息窗口限制",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "文件超过大小 {MAXIMUM_FILE_UPLOAD_SIZE} 附件限制",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
+    "BOT": "机器人",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "选择代理",
       "REMOVE": "删除",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 6d1fb212d..26244fdb2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -40,7 +40,7 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "非活跃工单的自动结单的天数",
         "PLACEHOLDER": "30",
-        "ERROR": "请输入一个合法的自动结单日期(最少1天)"
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "您的帐户启用了与电子邮件的对话连续性。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index d920634e8..5706c5c5b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "开启频道问候功能",
-          "HELP_TEXT": "在用户开始对话时发送问候消息。",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "已启用",
           "DISABLED": "已禁用"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "此字段是必填项"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "此字段是必填项"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "此字段是必填项"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "此字段是必填项"
+          },
+          "INBOX_NAME": {
+            "LABEL": "收件箱名称",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "此字段是必填项"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "电话号码",
+            "PLACEHOLDER": "请输入发送消息的电话号码。",
+            "ERROR": "请输入一个有效的值。电话号码应该以`+`开始。"
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "回调地址",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "已启用",
         "DISABLED": "已禁用"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "已启用",
+        "DISABLED": "已禁用"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "已启用",
+        "DISABLED": "已禁用"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "启用自动分配",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "收件箱设置",
       "INBOX_UPDATE_SUB_TEXT": "更新收件箱设置",
       "AUTO_ASSIGNMENT_SUB_TEXT": "启用或禁用添加到此收件箱的代理人自动分配新的会话。",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "开始将您的电子邮件转发到以下电子邮件地址。"
+      "FORWARD_EMAIL_SUB_TEXT": "开始将您的电子邮件转发到以下电子邮件地址。",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "重新授权",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/index.js b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index ef08080a9..93c07e49f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "密码",
+        "LABEL": "New password",
         "ERROR": "请输入长度6或更长的密码",
         "PLACEHOLDER": "请输入新密码"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "重新输入一次密码",
         "ERROR": "两次密码不一致",
-        "PLACEHOLDER": "请重新输入密码"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "自定义属性",
     "AUTOMATION": "Automation",
     "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "All Contacts",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
index 1e81cacdb..9224cf649 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Create new team",
     "HEADER": "Teams",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> A user can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "Edit team"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
index b7a58c037..9a280f504 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
@@ -19,7 +19,9 @@
       "contains": "Contains",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
-      "is_not_present": "Is not present"
+      "is_not_present": "Is not present",
+      "is_greater_than": "Is greater than",
+      "is_lesser_than": "Is lesser than"
     },
     "ATTRIBUTES": {
       "STATUS": "狀態",
@@ -31,7 +33,54 @@
       "LABELS": "標籤",
       "BROWSER_LANGUAGE": "Browser Language",
       "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link"
+      "REFERER_LINK": "Referer link",
+      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+    },
+    "GROUPS": {
+      "STANDARD_FILTERS": "Standard Filters",
+      "ADDITIONAL_FILTERS": "Additional Filters",
+      "CUSTOM_ATTRIBUTES": "自訂屬性"
+    },
+    "CUSTOM_VIEWS": {
+      "ADD": {
+        "TITLE": "Do you want to save this filter?",
+        "LABEL": "Name this filter",
+        "PLACEHOLDER": "Enter a name for this filter",
+        "ERROR_MESSAGE": "名稱為必填",
+        "SAVE_BUTTON": "Save filter",
+        "CANCEL_BUTTON": "取消",
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder created successfully",
+          "ERROR_MESSAGE": "Error while creating folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment created successfully",
+          "ERROR_MESSAGE": "Error while creating segment"
+        }
+      },
+      "DELETE": {
+        "DELETE_BUTTON": "Delete filter",
+        "MODAL": {
+          "CONFIRM": {
+            "TITLE": "確認刪除",
+            "MESSAGE": "Are you sure to delete the filter ",
+            "YES": "是，刪除",
+            "NO": "否，保留它"
+          }
+        },
+        "API_FOLDERS": {
+          "SUCCESS_MESSAGE": "Folder deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting folder"
+        },
+        "API_SEGMENTS": {
+          "SUCCESS_MESSAGE": "Segment deleted successfully",
+          "ERROR_MESSAGE": "Error while deleting segment"
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
index c3614a990..0a1f99e87 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
@@ -1,6 +1,89 @@
 {
   "AUTOMATION": {
     "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule"
+    "HEADER_BTN_TXT": "Add Automation Rule",
+    "LOADING": "Fetching automation rules",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "ADD": {
+      "TITLE": "Add Automation Rule",
+      "SUBMIT": "建立",
+      "CANCEL_BUTTON_TEXT": "取消",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Rule Name",
+          "PLACEHOLDER": "Enter rule name",
+          "ERROR": "名稱為必填"
+        },
+        "DESC": {
+          "LABEL": "描述資訊",
+          "PLACEHOLDER": "Enter rule description",
+          "ERROR": "描述為必填"
+        },
+        "EVENT": {
+          "LABEL": "Event",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Event is required"
+        },
+        "CONDITIONS": {
+          "LABEL": "Conditions"
+        },
+        "ACTIONS": {
+          "LABEL": "操作"
+        }
+      },
+      "CONDITION_BUTTON_LABEL": "Add Condition",
+      "ACTION_BUTTON_LABEL": "Add Action",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "姓名",
+        "描述資訊",
+        "Active",
+        "Created on"
+      ],
+      "404": "No automation rules found"
+    },
+    "DELETE": {
+      "TITLE": "Delete Automation Rule",
+      "SUBMIT": "刪除",
+      "CANCEL_BUTTON_TEXT": "取消",
+      "CONFIRM": {
+        "TITLE": "確認刪除",
+        "MESSAGE": "您確定要刪除嗎？ ",
+        "YES": "是，刪除 ",
+        "NO": "不，保留 "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Automation Rule",
+      "SUBMIT": "編輯",
+      "CANCEL_BUTTON_TEXT": "取消",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation rule updated successfully",
+        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+      }
+    },
+    "CLONE": {
+      "TOOLTIP": "Clone",
+      "API": {
+        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+      }
+    },
+    "FORM": {
+      "EDIT": "編輯",
+      "CREATE": "建立",
+      "DELETE": "刪除",
+      "CANCEL": "取消",
+      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
index 232c55b6b..2e0bf0840 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "新增預設回覆",
     "LOADING": "取得預設回覆",
     "SEARCH_404": "沒有任何項目符合此查詢",
-    "SIDEBAR_TXT": "<p><b>預設回覆</b> </p><p> 將預設回覆保存為回覆模板，用來快速發送回覆到對話。 </p><p> 若要建立預設回覆，只需點擊 <b>建立預設回覆</b>。 您也可以通過點擊編輯或刪除按鈕來編輯或刪除現有的預設回覆 </p><p> 在 <b>簡碼</b> 的幫助下使用預設的回覆方式。 客服在聊天時可以通過輸入 <b>'/'</b> 然後是簡碼使用預設回覆 </p>",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
     "LIST": {
       "404": "此帳戶中沒有可用的罐頭回覆。",
       "TITLE": "管理預設回覆",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "新增預設回覆",
-      "DESC": "預設回覆是保存的回覆模板，可以用來快速發送回覆到對話中。",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
       "CANCEL_BUTTON_TEXT": "取消操作",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "簡碼",
-          "PLACEHOLDER": "請輸入簡碼",
+          "PLACEHOLDER": "Please enter a short code",
           "ERROR": "必須輸入簡碼"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index baf688f25..0e4ea6631 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -169,6 +169,7 @@
       "SUBMIT": "傳送訊息",
       "CANCEL": "取消",
       "SUCCESS_MESSAGE": "訊息已傳送",
+      "GO_TO_CONVERSATION": "查看",
       "ERROR_MESSAGE": "無法傳送！請重新嘗試。"
     }
   },
@@ -178,6 +179,8 @@
     "SEARCH_BUTTON": "搜尋",
     "SEARCH_INPUT_PLACEHOLDER": "搜尋聯絡人",
     "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "聯絡人載入中...",
       "404": "找不到符合條件的聯絡人 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contactFilters.json b/app/javascript/dashboard/i18n/locale/zh_TW/contactFilters.json
index ee961031e..4bdd0dbc4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contactFilters.json
@@ -20,7 +20,9 @@
             "contains": "Contains",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
-            "is_not_present": "Is not present"
+            "is_not_present": "Is not present",
+            "is_greater_than": "Is greater than",
+            "is_lesser_than": "Is lesser than"
         },
         "ATTRIBUTES": {
             "NAME": "姓名",
@@ -28,7 +30,17 @@
             "PHONE_NUMBER": "電話號碼",
             "IDENTIFIER": "Identifier",
             "CITY": "城市",
-            "COUNTRY": "國家"
+            "COUNTRY": "國家",
+            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "自訂屬性"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index ee565faf5..5b6d15f56 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -22,6 +22,8 @@
     "LOADING_CONVERSATIONS": "加載更多對話",
     "CANNOT_REPLY": "您不能回覆，原因是：",
     "24_HOURS_WINDOW": "24 小時消息視窗限制",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "指定給我",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 小時消息視窗限制",
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
@@ -90,6 +92,9 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "寄送者：",
+    "BOT": "機器人",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "選擇客服",
       "REMOVE": "刪除",
@@ -127,7 +132,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "邀請團隊成員",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email address to the agent list.",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "按此邀請一個新成員"
     },
     "INBOXES": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 8086fb868..be2525943 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "開啟頻道問候功能",
-          "HELP_TEXT": "在用户開始對話時發送問候消息。",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
           "ENABLED": "已啟用",
           "DISABLED": "已停用"
         },
@@ -136,8 +136,56 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel via Twilio",
-        "DESC": "Start supporting your customers via SMS with Twilio integration."
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "此欄位是必填項目"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "此欄位是必填項目"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "此欄位是必填項目"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "此欄位是必填項目"
+          },
+          "INBOX_NAME": {
+            "LABEL": "收件匣名稱",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "此欄位是必填項目"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "電話號碼",
+            "PLACEHOLDER": "請輸入發送消息的電話號碼。",
+            "ERROR": "請輸入一個有效的值。電話號碼應該以`+`開始。"
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "回呼地址",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
       },
       "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
@@ -305,6 +353,14 @@
         "ENABLED": "已啟用",
         "DISABLED": "已停用"
       },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "已啟用",
+        "DISABLED": "已停用"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "已啟用",
+        "DISABLED": "已停用"
+      },
       "ENABLE_HMAC": {
         "LABEL": "Enable"
       }
@@ -351,6 +407,8 @@
       "AUTO_ASSIGNMENT": "啟用自動分配",
       "ENABLE_CSAT": "Enable CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
       "INBOX_UPDATE_TITLE": "收件匣設定",
       "INBOX_UPDATE_SUB_TEXT": "更新收件匣設定",
       "AUTO_ASSIGNMENT_SUB_TEXT": "啟用或停用此收件匣客服的對話自動分配。",
@@ -361,7 +419,9 @@
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "開始將您的電子信箱轉發到以下電子信箱地址。"
+      "FORWARD_EMAIL_SUB_TEXT": "開始將您的電子信箱轉發到以下電子信箱地址。",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "重新授權",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/index.js b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
index bfcef683a..5c1449fab 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
@@ -1,9 +1,12 @@
+import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
 import { default as _conversation } from './conversation.json';
 import { default as _csatMgmtMgmt } from './csatMgmt.json';
 import { default as _generalSettings } from './generalSettings.json';
@@ -20,12 +23,15 @@ import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 
 export default {
+  ..._advancedFilters,
   ..._agentMgmt,
   ..._attributesMgmt,
+  ..._automation,
   ..._campaign,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
+  ..._contactFilters,
   ..._conversation,
   ..._csatMgmtMgmt,
   ..._generalSettings,
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index e1a101f5c..c315314cf 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -89,14 +89,14 @@
         "PLACEHOLDER": "請輸入目前的密碼"
       },
       "PASSWORD": {
-        "LABEL": "密碼",
+        "LABEL": "New password",
         "ERROR": "請輸入長度6或更長的密碼",
         "PLACEHOLDER": "請輸入新密碼"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "重新輸入一次密碼",
         "ERROR": "兩次密碼不一致",
-        "PLACEHOLDER": "請重新輸入密碼"
+        "PLACEHOLDER": "Please re-enter your new password"
       }
     }
   },
@@ -153,6 +153,8 @@
     "CUSTOM_ATTRIBUTES": "自訂屬性",
     "AUTOMATION": "Automation",
     "TEAMS": "團隊",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "所有聯絡人",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
index b78835006..8b770b833 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "建立新團隊",
     "HEADER": "團隊",
-    "SIDEBAR_TXT": "<p><b>團隊</b></p> <p>團隊讓你將客服依照他們的職責分組。<br /> 一個使用者可以再多個團隊中。你可以將對話指派給一個團隊以協作。 </p>",
+    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
       "EDIT_TEAM": "編輯團隊"
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 0f2338a7f..5671c001e 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "إرسال"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "إرسال الرسالة مرة أخرى",
+      "ERROR_MESSAGE": "تعذر الإرسال! حاول مرة أخرى"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "عادة نقوم بالرد خلال يوم واحد"
   },
   "START_CONVERSATION": "ابدأ المحادثة",
+  "CONTINUE_CONVERSATION": "متابعة المحادثة",
   "START_NEW_CONVERSATION": "ابدأ محادثة جديدة",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "عرض الرسائل الجديدة",
diff --git a/app/javascript/widget/i18n/locale/bg.json b/app/javascript/widget/i18n/locale/bg.json
index b62b33f27..c101f2755 100644
--- a/app/javascript/widget/i18n/locale/bg.json
+++ b/app/javascript/widget/i18n/locale/bg.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Изпращане"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Обикновено отговаряме до един ден"
   },
   "START_CONVERSATION": "Започнете разговор",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Започнете нов разговор",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Вижте новите съобщения",
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index 4c7036c73..dc8db24dd 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Envia"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Normalment respon en un dia"
   },
   "START_CONVERSATION": "Inicia la conversa",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Veure missatges nous",
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index 54bf88392..110b83e4a 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Odeslat"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Obvykle odpoví za den"
   },
   "START_CONVERSATION": "Zahájit konverzaci",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Zahájit novou konverzaci",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Zobrazit nové zprávy",
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 3e67a2cfd..6af84bafd 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Send"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Svarer typisk på en dag"
   },
   "START_CONVERSATION": "Start Samtale",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start en ny samtale",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Se nye beskeder",
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index 6ce07c0df..4466c66e6 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Abschicken"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Nachricht erneut senden",
+      "ERROR_MESSAGE": "Senden nicht möglich, versuchen Sie es noch einmal"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -17,7 +21,8 @@
     "IN_A_FEW_HOURS": "Wir antworten üblicherweise innerhalb weniger Stunden",
     "IN_A_DAY": "Wir antworten üblicherweise innerhalb eines Tages"
   },
-  "START_CONVERSATION": "Sende uns eine Nachricht",
+  "START_CONVERSATION": "Unterhaltung beginnen",
+  "CONTINUE_CONVERSATION": "Konversation fortsetzen",
   "START_NEW_CONVERSATION": "Neue Unterhaltung starten",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Neue Nachrichten anzeigen",
@@ -28,7 +33,7 @@
   "BUBBLE": {
     "LABEL": "Chatten Sie mit uns"
   },
-  "POWERED_BY": "Powered by Chatwoot",
+  "POWERED_BY": "Unterstützt von Chatwoot",
   "EMAIL_PLACEHOLDER": "Bitte geben Sie Ihre E-Mail-Adresse ein",
   "CHAT_PLACEHOLDER": "Schreiben Sie Ihre Nachricht",
   "TODAY": "Heute",
@@ -53,7 +58,7 @@
     },
     "CAMPAIGN_HEADER": "Bitte geben Sie Ihren Namen und Ihre E-Mail-Adresse an, bevor Sie das Gespräch beginnen"
   },
-  "FILE_SIZE_LIMIT": "Die Datei überschreitet das Limit von {MAXIMUM_FILE_UPLOAD_SIZE} für Anhänge",
+  "FILE_SIZE_LIMIT": "Die Datei überschreitet das Anhangslimit von {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
     "INVALID": {
       "FIELD": "Ungültiges Feld"
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index bfd92b328..f8f0dab3f 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Καταχώρηση"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Επαναποστολή μηνύματος",
+      "ERROR_MESSAGE": "Αδυναμία αποστολής! Προσπαθήστε ξανά"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Τυπικά έχετε απάντηση σε μία ημέρα"
   },
   "START_CONVERSATION": "Έναρξη Συνομιλίας",
+  "CONTINUE_CONVERSATION": "Συνέχιση συνομιλίας",
   "START_NEW_CONVERSATION": "Έναρξη νέας συνομιλίας",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Δείτε τα νέα μηνύματα",
@@ -51,7 +56,7 @@
         "ERROR": "Πολύ σύντομο μήνυμα"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Παρακαλώ δώστε το όνομα και το email σας πριν ξεκινήσετε την συνομιλία"
   },
   "FILE_SIZE_LIMIT": "Το αρχείο υπερβαίνει το όριο συνημμένου {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index 6621f5a07..0ca88c798 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Enviar"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Enviar mensaje de nuevo",
+      "ERROR_MESSAGE": "¡No se pudo enviar! intente nuevamente"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Normalmente responde en un día"
   },
   "START_CONVERSATION": "Iniciar conversación",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Iniciar una nueva conversación",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver nuevos mensajes",
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index b314bbda7..1265cdb22 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "ثبت"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "دوباره پیام بدید",
+      "ERROR_MESSAGE": "ارسال نشد، دوباره امتحان کنید"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "به طور معمول در یک روز پاسخ می دهند"
   },
   "START_CONVERSATION": "شروع گفتگو",
+  "CONTINUE_CONVERSATION": "ادامه گفتگو",
   "START_NEW_CONVERSATION": "یک مکالمه جدید را شروع کنید",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "مشاهده پیام‌های جدید",
@@ -66,7 +71,7 @@
   },
   "EMAIL_TRANSCRIPT": {
     "BUTTON_TEXT": "درخواست رونوشت مکالمه",
-    "SEND_EMAIL_SUCCESS": "متن گفتگو با موفقیت ارسال شد",
+    "SEND_EMAIL_SUCCESS": "رونوشت گفتگو با موفقیت ارسال شد",
     "SEND_EMAIL_ERROR": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
   }
 }
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index f2ce76cf4..e399a27ca 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Lähetä"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Vastaa tyypillisesti päivässä"
   },
   "START_CONVERSATION": "Aloita keskustelu",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Näytä uudet viestit",
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 222dc163a..d151513ee 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Envoyer"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Répond généralement dans la journée"
   },
   "START_CONVERSATION": "Démarrer la conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Démarrer une nouvelle conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Voir les nouveaux messages",
diff --git a/app/javascript/widget/i18n/locale/he.json b/app/javascript/widget/i18n/locale/he.json
index 96e99fcab..966583c97 100644
--- a/app/javascript/widget/i18n/locale/he.json
+++ b/app/javascript/widget/i18n/locale/he.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "שלח"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "מענה ממוצע לאחר יום"
   },
   "START_CONVERSATION": "התחל שיחה",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "התחל שיחה חדשה",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "ראה הודעות חדשות",
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index fa97c5abc..7718ea4d1 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Submit"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Typically replies in a day"
   },
   "START_CONVERSATION": "Start Conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 83cc4d4d3..523de698c 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Elküldés"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Üzenet elküldése újból",
+      "ERROR_MESSAGE": "Nem sikerült az elküldés, kérjük próbáld később"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,11 +22,12 @@
     "IN_A_DAY": "Általánban egy napon belül válaszol"
   },
   "START_CONVERSATION": "Beszélgetés megkezdése",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
+  "START_NEW_CONVERSATION": "Új beszélgetés megkezdése",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Új üzenetek",
     "CLOSE_MESSAGES_BUTTON": "Bezárás",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "innen",
     "BOT": "Bot"
   },
   "BUBBLE": {
@@ -51,21 +56,21 @@
         "ERROR": "Az üzenet túl rövid"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Kérjük a beszélgetés megkezdése előtt add meg neved és e-mail címed"
   },
   "FILE_SIZE_LIMIT": "A file mérete meghaladja a {MAXIMUM_FILE_UPLOAD_SIZE} limitet",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Érvénytelen mező"
     }
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Értékeld a beszélgetést",
+    "SUBMITTED_TITLE": "Köszönjük, hogy elküldted az értékelést",
+    "PLACEHOLDER": "Mondj nekünk többet..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "Beszélgetés kivonat igénylése",
     "SEND_EMAIL_SUCCESS": "A beszélgetés jegyzet sikeresen elküldve",
     "SEND_EMAIL_ERROR": "Hiba történt, kérjük próbáld újra"
   }
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index 281a0600c..50fd7ef72 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Kirim"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Biasanya membalas dalam sehari"
   },
   "START_CONVERSATION": "Mulai Percakapan",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Lihat pesan baru",
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index 8834ade22..b11718a2f 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -6,21 +6,26 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Invia"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Invia di nuovo il messaggio",
+      "ERROR_MESSAGE": "Impossibile inviare, riprova"
     }
   },
   "TEAM_AVAILABILITY": {
     "ONLINE": "Siamo online",
-    "OFFLINE": "Al momento non è disponibile nessun operatore"
+    "OFFLINE": "Siamo offline in questo momento"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "In genere risponde in pochi minuti",
     "IN_A_FEW_HOURS": "In genere risponde in poche ore",
-    "IN_A_DAY": "In genere le risposte in un giorno"
+    "IN_A_DAY": "In genere risponde in un giorno"
   },
-  "START_CONVERSATION": "Avvia Conversazione",
+  "START_CONVERSATION": "Avvia conversazione",
+  "CONTINUE_CONVERSATION": "Continua conversazione",
   "START_NEW_CONVERSATION": "Avvia una nuova conversazione",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "Vedi nuovi messaggi",
+    "VIEW_MESSAGES_BUTTON": "Vedi i nuovi messaggi",
     "CLOSE_MESSAGES_BUTTON": "Chiudi",
     "COMPANY_FROM": "da",
     "BOT": "Bot"
@@ -28,7 +33,7 @@
   "BUBBLE": {
     "LABEL": "Chatta con noi"
   },
-  "POWERED_BY": "Powered by Chatwoot",
+  "POWERED_BY": "Offerto da Chatwoot",
   "EMAIL_PLACEHOLDER": "Inserisci la tua email",
   "CHAT_PLACEHOLDER": "Scrivi il tuo messaggio",
   "TODAY": "Oggi",
@@ -36,13 +41,13 @@
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
-        "LABEL": "Nome Completo",
-        "PLACEHOLDER": "Per favore inserisci il nome completo",
-        "ERROR": "Nome completo è richiesto"
+        "LABEL": "Nome completo",
+        "PLACEHOLDER": "Per favore inserisci il tuo nome completo",
+        "ERROR": "Il nome completo è richiesto"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Indirizzo email",
-        "PLACEHOLDER": "Inserisci il tuo indirizzo e-mail",
+        "PLACEHOLDER": "Inserisci il tuo indirizzo email",
         "ERROR": "Indirizzo email non valido"
       },
       "MESSAGE": {
@@ -51,7 +56,7 @@
         "ERROR": "Messaggio troppo corto"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Per favore inserisci il tuo nome ed email prima di iniziare la conversazione"
   },
   "FILE_SIZE_LIMIT": "Il file supera il limite di {MAXIMUM_FILE_UPLOAD_SIZE} per poter essere allegato",
   "CHAT_FORM": {
@@ -62,7 +67,7 @@
   "CSAT": {
     "TITLE": "Valuta la conversazione",
     "SUBMITTED_TITLE": "Grazie per aver inviato la valutazione",
-    "PLACEHOLDER": "Dicci di più..."
+    "PLACEHOLDER": "Raccontaci di più..."
   },
   "EMAIL_TRANSCRIPT": {
     "BUTTON_TEXT": "Richiedi la trascrizione della conversazione",
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index b262f9e6d..219d8c267 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "送信"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "通常数日以内にご返信します。"
   },
   "START_CONVERSATION": "チャットを開始する",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "新しいメッセージを見る",
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index 22feaed40..8df2e8a3f 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "보내기"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "보통 하루 안에 응답"
   },
   "START_CONVERSATION": "대화 시작",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "새 메시지 보기",
diff --git a/app/javascript/widget/i18n/locale/lv.json b/app/javascript/widget/i18n/locale/lv.json
new file mode 100644
index 000000000..7718ea4d1
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/lv.json
@@ -0,0 +1,77 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
+    }
+  },
+  "TEAM_AVAILABILITY": {
+    "ONLINE": "We are online",
+    "OFFLINE": "We are away at the moment"
+  },
+  "REPLY_TIME": {
+    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
+    "IN_A_FEW_HOURS": "Typically replies in a few hours",
+    "IN_A_DAY": "Typically replies in a day"
+  },
+  "START_CONVERSATION": "Start Conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
+  "START_NEW_CONVERSATION": "Start a new conversation",
+  "UNREAD_VIEW": {
+    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "CLOSE_MESSAGES_BUTTON": "Close",
+    "COMPANY_FROM": "from",
+    "BOT": "Bot"
+  },
+  "BUBBLE": {
+    "LABEL": "Chat with us"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message",
+  "TODAY": "Today",
+  "YESTERDAY": "Yesterday",
+  "PRE_CHAT_FORM": {
+    "FIELDS": {
+      "FULL_NAME": {
+        "LABEL": "Full Name",
+        "PLACEHOLDER": "Please enter your full name",
+        "ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email Address",
+        "PLACEHOLDER": "Please enter your email address",
+        "ERROR": "Invalid email address"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    },
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+  },
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  },
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "SUBMITTED_TITLE": "Thank you for submitting the rating",
+    "PLACEHOLDER": "Tell us more..."
+  },
+  "EMAIL_TRANSCRIPT": {
+    "BUTTON_TEXT": "Request a conversation transcript",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again"
+  }
+}
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index c96a75e06..e87791032 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -6,11 +6,15 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "സമർപ്പിക്കുക"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "വീണ്ടും സന്ദേശം അയയ്‌ക്കുക",
+      "ERROR_MESSAGE": "അയയ്‌ക്കാനായില്ല, വീണ്ടും ശ്രമിക്കുക"
     }
   },
   "TEAM_AVAILABILITY": {
-    "ONLINE": "We are online",
-    "OFFLINE": "We are away at the moment"
+    "ONLINE": "ഞങ്ങൾ ഓൺലൈനിലാണ്",
+    "OFFLINE": "ഞങ്ങൾ ഇപ്പോൾ അകലെയാണ്"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "സാധാരണയായി കുറച്ച് മിനിറ്റിനുള്ളിൽ മറുപടി നൽകുന്നു",
@@ -18,17 +22,18 @@
     "IN_A_DAY": "സാധാരണയായി ഒരു ദിവസത്തിൽ മറുപടി നൽകുന്നു"
   },
   "START_CONVERSATION": "സംഭാഷണം ആരംഭിക്കുക",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
+  "START_NEW_CONVERSATION": "ഒരു പുതിയ സംഭാഷണം ആരംഭിക്കുക",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "പുതിയ സന്ദേശങ്ങൾ കാണുക",
     "CLOSE_MESSAGES_BUTTON": "അടയ്ക്കുക",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "നിന്ന്",
     "BOT": "ബോട്ട്"
   },
   "BUBBLE": {
     "LABEL": "ഞങ്ങളുമായി ചാറ്റുചെയ്യുക"
   },
-  "POWERED_BY": "Powered by Chatwoot",
+  "POWERED_BY": "പ്രായോജകർ Chatwoot",
   "EMAIL_PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ നൽകുക",
   "CHAT_PLACEHOLDER": "നിങ്ങളുടെ സന്ദേശം ടൈപ്പുചെയ്യുക",
   "TODAY": "ഇന്ന്",
@@ -38,34 +43,34 @@
       "FULL_NAME": {
         "LABEL": "പൂർണ്ണമായ പേര്",
         "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ മുഴുവൻ പേര് നൽകുക",
-        "ERROR": "Full Name is required"
+        "ERROR": "മുഴുവൻ പേര് ആവശ്യമാണ്"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "ഇമെയിൽ വിലാസം",
-        "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ വിലാസം നൽകുക",
+        "ERROR": "ഇമെയിൽ വിലാസം അസാധുവാണ്"
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "LABEL": "സന്ദേശം",
+        "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ സന്ദേശം നൽകുക",
+        "ERROR": "സന്ദേശം വളരെ ചെറുതാണ്"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "സംഭാഷണം ആരംഭിക്കുന്നതിന് മുമ്പ് ദയവായി നിങ്ങളുടെ പേരും ഇമെയിലും നൽകുക"
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "FILE_SIZE_LIMIT": "ഫയൽ {MAXIMUM_FILE_UPLOAD_SIZE} അറ്റാച്ച്‌മെന്റ് പരിധി കവിഞ്ഞു",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "അസാധുവായ ഫീൽഡ്"
     }
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "നിങ്ങളുടെ സംഭാഷണം റേറ്റുചെയ്യുക",
+    "SUBMITTED_TITLE": "റേറ്റിംഗ് സമർപ്പിച്ചതിന് നന്ദി",
+    "PLACEHOLDER": "ഞങ്ങളോട് കൂടുതൽ പറയൂ..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "ഒരു സംഭാഷണ ട്രാൻസ്ക്രിപ്റ്റ് അഭ്യർത്ഥിക്കുക",
     "SEND_EMAIL_SUCCESS": "ചാറ്റ് ട്രാൻസ്ക്രിപ്റ്റ് വിജയകരമായി അയച്ചു",
     "SEND_EMAIL_ERROR": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
   }
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index 880561141..a6ec8f639 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "बुझाउनुहोस्"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "धेरै जसो एक दिनमा जवाफ हुन्छ"
   },
   "START_CONVERSATION": "कुराकानी सुरु गर्नुहोस्",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "नयाँ सन्देशहरू हेर्नुहोस्",
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index 66443f2bf..878e0884b 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Bevestigen"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Reageert meestal binnen een dag"
   },
   "START_CONVERSATION": "Start Chat",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Een nieuw gesprek starten",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Bekijk nieuwe berichten",
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index af2eb725a..f5acf8e51 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Send"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Svarer vanligvis innen en dag"
   },
   "START_CONVERSATION": "Start samtale",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start en ny samtale",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Se nye meldinger",
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index dab9cf790..a02ce7ad8 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Wyślij"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Zwykle odpowiadamy w przeciągu jednego dnia"
   },
   "START_CONVERSATION": "Rozpocznij rozmowę",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Pokaż nowe wiadomości",
@@ -60,9 +65,9 @@
     }
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
+    "TITLE": "Oceń udzielone Ci wsparcie",
     "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "PLACEHOLDER": "Dodaj swój komentarz..."
   },
   "EMAIL_TRANSCRIPT": {
     "BUTTON_TEXT": "Request a conversation transcript",
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index 2de37268a..84a1ed311 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "submeter"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Normalmente respondemos num dia"
   },
   "START_CONVERSATION": "Iniciar Conversa",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Iniciar uma nova conversa",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver novas mensagens",
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 057390e97..165055552 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Enviar"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Enviar mensagem novamente",
+      "ERROR_MESSAGE": "Não foi possível enviar, tente novamente"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Responde normalmente em um dia"
   },
   "START_CONVERSATION": "Iniciar Conversa",
+  "CONTINUE_CONVERSATION": "Continuar conversa",
   "START_NEW_CONVERSATION": "Iniciar uma nova conversa",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver novas mensagens",
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index bdb6a4a6d..1516e2640 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Trimite"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Typically replies in a day"
   },
   "START_CONVERSATION": "Start Conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Vezi mesajele noi",
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index f334079d3..149e81812 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Отправить"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Отправить сообщение еще раз",
+      "ERROR_MESSAGE": "Не удалось отправить! Попробуйте еще раз"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Обычно отвечаем в течение дня"
   },
   "START_CONVERSATION": "Начать диалог",
+  "CONTINUE_CONVERSATION": "Продолжить беседу",
   "START_NEW_CONVERSATION": "Начать диалог",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Посмотреть новые сообщения",
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 5ec03980c..7d9057efd 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Odoslať"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Zvyčajne odpovedá do dňa"
   },
   "START_CONVERSATION": "Začať konverzáciu",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Začať novú konverzáciu",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Zobraziť nové správy",
@@ -28,7 +33,7 @@
   "BUBBLE": {
     "LABEL": "Četujte s nami"
   },
-  "POWERED_BY": "Powered by Chatwoot",
+  "POWERED_BY": "Používame Chatwoot",
   "EMAIL_PLACEHOLDER": "Zadajte svoj e-mail",
   "CHAT_PLACEHOLDER": "Zadajte svoju správu",
   "TODAY": "Dnes",
@@ -60,9 +65,9 @@
     }
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
+    "TITLE": "Ohodnoťte konverzáciu",
     "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "PLACEHOLDER": "Povedzte nám viac..."
   },
   "EMAIL_TRANSCRIPT": {
     "BUTTON_TEXT": "Request a conversation transcript",
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index feb07095a..89d9b7404 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Skicka"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Skicka meddelande igen",
+      "ERROR_MESSAGE": "Kunde inte skicka, försök igen"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,7 +22,8 @@
     "IN_A_DAY": "Svar vanligtvis inom en dag"
   },
   "START_CONVERSATION": "Starta konversation",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "CONTINUE_CONVERSATION": "Fortsätt konversation",
+  "START_NEW_CONVERSATION": "Starta konversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Se nya meddelanden",
     "CLOSE_MESSAGES_BUTTON": "Stäng",
@@ -47,25 +52,25 @@
       },
       "MESSAGE": {
         "LABEL": "Meddelande",
-        "PLACEHOLDER": "Vänligen ange ditt meddelande",
+        "PLACEHOLDER": "Vänligen ange ditt fullständiga namn",
         "ERROR": "Meddelandet är för kort"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Ange ditt namn och e-post innan du startar konversationen"
   },
   "FILE_SIZE_LIMIT": "Filen överskrider gränsen för {MAXIMUM_FILE_UPLOAD_SIZE} bifogade filer",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Ogiltigt fält"
     }
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Betygsätt din konversation",
+    "SUBMITTED_TITLE": "Tack för att du lämnat in omdömet",
+    "PLACEHOLDER": "Berätta mer för oss!"
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "Skicka konversationstranskribering",
     "SEND_EMAIL_SUCCESS": "Chattranskriberingen har skickats",
     "SEND_EMAIL_ERROR": "Ett fel uppstod, vänligen försök igen"
   }
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index fa372ec89..b9c3dc237 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "சமர்பிக்கவும்"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Typically replies in a day"
   },
   "START_CONVERSATION": "Start Conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index 2bd006706..bd6bf1210 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "ส่ง"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Typically replies in a day"
   },
   "START_CONVERSATION": "Start Conversation",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index e42d193c0..937b4a673 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Yolla"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Genellikle bir gün içinde yanıtlar"
   },
   "START_CONVERSATION": "Görüşmeyi Başlatın",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Görüşmeyi Başlatın",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Yeni mesajları gör",
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index 027a87154..0ccde5fee 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Додати"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Зазвичай, відповідаємо протягом доби"
   },
   "START_CONVERSATION": "Розпочати розмову",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Розпочати нову розмову",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Переглянути нові повідомлення",
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index 749e13308..d2b21ffee 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Gửi"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "Thường trả lời trong một ngày"
   },
   "START_CONVERSATION": "Bắt đầu một cuộc trò chuyện",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Xem tin nhắn mới",
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index eaba6464c..cce5f2908 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "提交"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "通常在一天之内回复您"
   },
   "START_CONVERSATION": "开始会话",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "查看新消息",
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index e29c719d7..bd767c301 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -6,6 +6,10 @@
     },
     "FORM_BUBBLE": {
       "SUBMIT": "送出"
+    },
+    "MESSAGE_BUBBLE": {
+      "RETRY": "Send message again",
+      "ERROR_MESSAGE": "Couldn't send, try again"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -18,6 +22,7 @@
     "IN_A_DAY": "通常在一天內回覆"
   },
   "START_CONVERSATION": "開始對話",
+  "CONTINUE_CONVERSATION": "Continue conversation",
   "START_NEW_CONVERSATION": "開始一個新對話",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "查看新訊息",
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 407334e08..28de958df 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -79,8 +79,8 @@ ar:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: '%{assignee_name} من %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} من %{inbox_name} <%{reply_email}>'
       email_subject: "رسائل جديدة في هذه المحادثة"
       transcript_subject: "نص المحادثة"
     survey:
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index da68c2178..d1ac91177 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -19,7 +19,7 @@ de:
       confirmation_instructions:
         subject: "Anleitung zur Bestätigung"
       reset_password_instructions:
-        subject: "Anweisungen zum Zurücksetzen Ihres Passworts"
+        subject: "Anweisungen zum Zurücksetzen des Passworts"
       unlock_instructions:
         subject: "Anleitung zur Entsperren"
       password_change:
@@ -58,4 +58,4 @@ de:
       not_locked: "wurde nicht gesperrt"
       not_saved:
         one: "1 Fehler verhinderte, dass %{resource} gespeichert wurde:"
-        other: "%{count} Fehler haben verhindert, dass %{resource} gespeichert wurde:"
+        other: "%{count} Fehler verhinderten, dass %{resource} gespeichert wurde:"
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index d312e09e6..d09cf279d 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -4,16 +4,16 @@ it:
     confirmations:
       confirmed: "Il tuo indirizzo email è stato confermato con successo."
       send_instructions: "Riceverai una email con le istruzioni per confermare il tuo indirizzo email in pochi minuti."
-      send_paranoid_instructions: "Se il tuo indirizzo email esiste nel nostro database, entro pochi minuti riceverai un'e-mail con le istruzioni per confermare il tuo indirizzo email."
+      send_paranoid_instructions: "Se il tuo indirizzo email esiste nel nostro database, entro pochi minuti riceverai un'email con le istruzioni per confermare il tuo indirizzo email."
     failure:
       already_authenticated: "Hai già effettuato l'accesso."
       inactive: "Il tuo account non è ancora attivato."
-      invalid: "%{authentication_keys}/password o account non valido non è ancora verificato."
+      invalid: "%{authentication_keys}/password non valida o account non ancora verificato."
       locked: "Il tuo account è bloccato."
       last_attempt: "Hai ancora un tentativo prima che il tuo account venga bloccato."
       not_found_in_database: "%{authentication_keys} o password non validi."
       timeout: "La sessione è scaduta. Effettua nuovamente l'accesso per continuare."
-      unauthenticated: "Devi accedere o iscriverti prima di continuare."
+      unauthenticated: "Devi accedere o registrarti prima di continuare."
       unconfirmed: "Devi confermare il tuo indirizzo email prima di continuare."
     mailer:
       confirmation_instructions:
@@ -28,27 +28,27 @@ it:
       failure: "Impossibile autenticarti da %{kind} perché \"%{reason}\"."
       success: "Autenticato con successo dall'account %{kind}."
     passwords:
-      no_token: "Non puoi accedere a questa pagina senza provenire da un'email di reimpostazione della password. Se vieni da un'e-mail di reimpostazione della password, assicurati di aver utilizzato l'URL completo."
-      send_instructions: "Tra pochi minuti riceverai un'e-mail con le istruzioni su come reimpostare la password."
+      no_token: "Non puoi accedere a questa pagina senza provenire da un'email di reimpostazione della password. Se vieni da un'email di reimpostazione della password, assicurati di aver utilizzato l'URL completo."
+      send_instructions: "Tra pochi minuti riceverai un'email con le istruzioni su come reimpostare la password."
       send_paranoid_instructions: "Se il tuo indirizzo email è presente nel nostro database, entro pochi minuti riceverai un link per reimpostare la password."
       updated: "La tua password è stata modificata con successo. Ora sei collegato."
       updated_not_active: "La tua password è stata modificata con successo."
     registrations:
-      destroyed: "Ciao! Il tuo account è stato cancellato con successo. Speriamo di rivederti presto."
+      destroyed: "Ciao! Il tuo account è stato eliminato con successo. Speriamo di rivederti presto."
       signed_up: "Benvenuto! Ti sei registrato correttamente."
-      signed_up_but_inactive: "Ti sei registrato con successo. Tuttavia, non puoi accedere perché il tuo account non è ancora attivato."
+      signed_up_but_inactive: "Ti sei registrato correttamente. Tuttavia, non puoi accedere perché il tuo account non è ancora attivato."
       signed_up_but_locked: "Ti sei registrato correttamente. Tuttavia, non puoi accedere perché il tuo account è bloccato."
       signed_up_but_unconfirmed: "Un messaggio con un link di conferma è stato inviato al tuo indirizzo email. Segui il link per attivare l'account."
       update_needs_confirmation: "Il tuo account è stato aggiornato correttamente, ma dobbiamo verificare il tuo nuovo indirizzo email. Controlla la tua email e segui il link di conferma per confermare il tuo nuovo indirizzo email."
       updated: "Il tuo account è stato aggiornato con successo."
     sessions:
       signed_in: "Accesso effettuato."
-      signed_out: "Logout riuscito."
-      already_signed_out: "Logout riuscito."
+      signed_out: "Disconnessione effettuata."
+      already_signed_out: "Disconnessione effettuata."
     unlocks:
       send_instructions: "Entro pochi minuti riceverai una email con le istruzioni per sbloccare il tuo account."
-      send_paranoid_instructions: "Se il tuo account esiste, entro pochi minuti riceverai un'e-mail con le istruzioni per sbloccarlo."
-      unlocked: "Il tuo account è stato sbloccato con successo. Per favore accedi per continuare."
+      send_paranoid_instructions: "Se il tuo account esiste, entro pochi minuti riceverai un'email con le istruzioni per sbloccarlo."
+      unlocked: "Il tuo account è stato sbloccato con successo. Accedi per continuare."
   errors:
     messages:
       already_confirmed: "è già stato confermato, prova ad accedere"
@@ -57,5 +57,5 @@ it:
       not_found: "non trovato"
       not_locked: "non è stato bloccato"
       not_saved:
-        one: "Non posso salvare questo %{resource} : 1 errore"
+        one: "1 errore impedisce il salvataggio di questo %{resource}:"
         other: "%{count} errori impediscono il salvataggio di questo %{resource}:"
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
new file mode 100644
index 000000000..dc234073b
--- /dev/null
+++ b/config/locales/devise.lv.yml
@@ -0,0 +1,62 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+lv:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys}/password or account is not verified yet."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation Instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        zero: "%{count} errors prohibited this %{resource} from being saved:"
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.ml.yml b/config/locales/devise.ml.yml
index 522d42d9c..27c95231b 100644
--- a/config/locales/devise.ml.yml
+++ b/config/locales/devise.ml.yml
@@ -11,15 +11,15 @@ ml:
       invalid: "%{authentication_keys} പാസ്‌വേഡോ അക്കൗണ്ടോ ഇതുവരെ പരിശോധിച്ചിട്ടില്ല.\n"
       locked: "നിങ്ങളുടെ അക്കൗണ്ട് ലോക്കുചെയ്‌തു.\n"
       last_attempt: "നിങ്ങളുടെ അക്കൗണ്ട് ലോക്കുചെയ്യുന്നതിന് മുമ്പ് നിങ്ങൾക്ക് ഒരു ശ്രമം കൂടി."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
-      timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your email address before continuing."
+      not_found_in_database: "%{authentication_keys} അല്ലെങ്കിൽ പാസ്‌വേഡ് അസാധുവാണ്."
+      timeout: "നിങ്ങളുടെ സെഷൻ കാലഹരണപ്പെട്ടു. തുടരാൻ വീണ്ടും സൈൻ ഇൻ ചെയ്യുക."
+      unauthenticated: "തുടരുന്നതിന് മുമ്പ് നിങ്ങൾ സൈൻ ഇൻ ചെയ്യുകയോ സൈൻ അപ്പ് ചെയ്യുകയോ ചെയ്യേണ്ടതുണ്ട്."
+      unconfirmed: "തുടരുന്നതിന് മുമ്പ് നിങ്ങളുടെ ഇമെയിൽ വിലാസം സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."
     mailer:
       confirmation_instructions:
         subject: "സ്ഥിരീകരണ നിർദ്ദേശങ്ങൾ"
       reset_password_instructions:
-        subject: "Reset password instructions"
+        subject: "പാസ്‌വേഡ് നിർദ്ദേശങ്ങൾ പുനഃസജ്ജമാക്കുക"
       unlock_instructions:
         subject: "Unlock instructions"
       password_change:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index d167020fb..1ece4cc8a 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -79,8 +79,8 @@ el:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: '%{assignee_name} από %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} από %{inbox_name} <reply+%{reply_email}>'
       email_subject: "νέα μηνύματα σε αυτήν την συνομιλία"
       transcript_subject: "Μεταγραφή Συνομιλίας"
     survey:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 2094fc8e7..1ea0b5323 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -25,11 +25,11 @@ fa:
     signup:
       disposable_email: استفاده از ایمیل‌های موقت امکان‌پذیر نیست
       invalid_email: ایمیل وارد شده معتبر نیست
-      email_already_exists: "قبلا کاربری با ایمیل %{email} ثبت نام کرده است."
+      email_already_exists: "قبلا کاربری با ایمیل %{email} ثبت‌نام کرده است"
       failed: ثبت نام ناموفق بود
     contacts:
       import:
-        failed: فایل خالی است
+        failed: پرونده خالی است
   reports:
     period: زمان گزارش از %{since} تا %{until}
     agent_csv:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 0b5b83e56..9358283f3 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -29,7 +29,7 @@ hu:
       failed: Feliratkozás sikertelen
     contacts:
       import:
-        failed: File is blank
+        failed: A fájl üres
   reports:
     period: Jelentési időszak %{since}-tól %{until}-ig
     agent_csv:
@@ -56,7 +56,7 @@ hu:
         resolved: "A beszélgetést lezárta %{user_name}"
         open: "A beszélgetést újranyitotta %{user_name}"
         pending: "A beszélgetést %{user_name} folyamatban lévőnek jelölte"
-        snoozed: "Conversation was snoozed by %{user_name}"
+        snoozed: "A beszélgetést %{user_name} elnémította"
         auto_resolved: "A beszélgetést lezárta a rendszer mivel %{duration} napja inaktív volt"
       assignee:
         self_assigned: "%{user_name} magára osztotta ezt a beszélgetést"
@@ -79,15 +79,15 @@ hu:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: '%{assignee_name} innen %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} innen %{inbox_name} <reply+%{reply_email}>'
       email_subject: "Új üzenet a beszélgetésben"
       transcript_subject: "Beszélgetés kivonat"
     survey:
       response: "Kérlek értékeld a beszélgetést, %{link}"
   contacts:
     online:
-      delete: "%{contact_name} is Online, please try again later"
+      delete: "%{contact_name} elérhető, kérjük, próbálja meg később újra"
   integration_apps:
     slack:
       name: "Slack"
@@ -97,7 +97,7 @@ hu:
       description: "A Webhook események valós idejű információt adnak arról, hogy mi történik a fiókodban. Webhookokat használhatsz arra, hogy az eseményeket a kedvenc appjaidban, pl. a Slackben vagy a Githubban használd. Kattints hogy beállíthast a Webhookjaidat."
     dialogflow:
       name: "Dialogflow"
-      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+      description: "Építsen chatbotokat a Dialogflow segítségével, és kapcsolja őket gyorsan a postaládájához. Hagyja, hogy a botok kezeljék a kérdéseket, mielőtt átadná őket egy ügyfélszolgálati ügynöknek."
     fullcontact:
-      name: "Fullcontact"
-      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
+      name: "FullContact"
+      description: "A FullContact integráció segít a látogatói profilok egységesítésében. Azonosítsa a felhasználókat, amint megosztják e-mail címüket, és kínáljon nekik személyre szabott ügyfélszolgálatot. Csatlakoztassa a FullContactot fiókjához a FullContact API-kulcs megosztásával."
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 4337478d6..f2196c983 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -20,26 +20,26 @@ it:
   hello: "Ciao mondo"
   messages:
     reset_password_success: Woot! Richiesta di reimpostazione della password riuscita. Controlla la tua mail per le istruzioni.
-    reset_password_failure: Ciao! Non siamo riusciti a trovare alcun utente con l'email specificata.
+    reset_password_failure: Uh ho! Non siamo riusciti a trovare alcun utente con l'email specificata.
   errors:
     signup:
-      disposable_email: Non consentiamo email disponibili
+      disposable_email: Non consentiamo email usa e getta
       invalid_email: Hai inserito un'email non valida
       email_already_exists: "Ti sei già registrato per un account con %{email}"
-      failed: Iscrizione fallita
+      failed: Registrazione non riuscita
     contacts:
       import:
         failed: Il file è vuoto
   reports:
     period: Periodo di segnalazione da %{since} a %{until}
     agent_csv:
-      agent_name: Nome dell'agente
-      conversations_count: Conteggio conversazioni
+      agent_name: Nome agente
+      conversations_count: Numero di conversazioni
       avg_first_response_time: Tempo medio di prima risposta (minuti)
       avg_resolution_time: Tempo medio di risoluzione (minuti)
     team_csv:
       team_name: Nome del team
-      conversations_count: Conteggio conversazioni
+      conversations_count: Numero di conversazioni
       avg_first_response_time: Tempo medio di prima risposta (minuti)
       avg_resolution_time: Tempo medio di risoluzione (minuti)
   notifications:
@@ -53,51 +53,51 @@ it:
       deleted: Questo messaggio è stato eliminato
     activity:
       status:
-        resolved: "Conversazione segnata da %{user_name}"
+        resolved: "La conversazione è stata contrassegnata come risolta da %{user_name}"
         open: "La conversazione è stata riaperta da %{user_name}"
         pending: "La conversazione è stata contrassegnata come in attesa da %{user_name}"
-        snoozed: "La conversazione è stata sospesa da %{user_name}"
-        auto_resolved: "La conversazione è stata segnata risolta dal sistema a causa di %{duration} giorni di inattività"
+        snoozed: "La conversazione è stata posticipata da %{user_name}"
+        auto_resolved: "La conversazione è stata contrassegnata come risolta dal sistema a causa di %{duration} giorni d'inattività"
       assignee:
-        self_assigned: "%{user_name} auto-assegnato a questa conversazione"
+        self_assigned: "%{user_name} si è assegnato a questa conversazione"
         assigned: "Assegnato a %{assignee_name} da %{user_name}"
         removed: "Conversazione non assegnata da %{user_name}"
       team:
         assigned: "Assegnato a %{team_name} da %{user_name}"
-        assigned_with_assignee: "Assegnato a %{assignee_name} via %{team_name} da %{user_name}"
-        removed: "Assegnato a %{team_name} da %{user_name}"
+        assigned_with_assignee: "Assegnato a %{assignee_name} tramite %{team_name} da %{user_name}"
+        removed: "Assegnazione a %{team_name} rimossa da %{user_name}"
       labels:
         added: "%{user_name} ha aggiunto %{labels}"
-        removed: "%{user_name} rimosso %{labels}"
+        removed: "%{user_name} ha rimosso %{labels}"
       muted: "%{user_name} ha silenziato la conversazione"
-      unmuted: "%{user_name} ha attivato le notifiche alla conversazione"
+      unmuted: "%{user_name} ha riattivato l'audio della conversazione"
     templates:
       greeting_message_body: "%{account_name}, in genere, risponde in poche ore."
-      ways_to_reach_you_message_body: "Offri alla squadra un modo per raggiungerti."
-      email_input_box_message_body: "Ricevi una notifica via email"
+      ways_to_reach_you_message_body: "Offri al team un modo per raggiungerti."
+      email_input_box_message_body: "Ricevi notifiche via email"
       csat_input_message_body: "Valuta la conversazione"
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: '%{assignee_name} da %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} da %{inbox_name} <reply+%{reply_email}>'
       email_subject: "Nuovi messaggi in questa conversazione"
-      transcript_subject: "Trascrizione della Conversazione"
+      transcript_subject: "Trascrizione della conversazione"
     survey:
       response: "Valuta questa conversazione, %{link}"
   contacts:
     online:
-      delete: "%{contact_name} is Online, please try again later"
+      delete: "%{contact_name} è online, riprova più tardi"
   integration_apps:
     slack:
       name: "Slack"
-      description: "Slack è uno strumento di chat che porta tutta la vostra comunicazione insieme in un unico posto. Integrando Slack, puoi ricevere una notifica di tutte le nuove conversazioni nel tuo account direttamente all'interno della tua Slack."
+      description: "Slack è uno strumento di chat che porta tutta la vostra comunicazione insieme in un unico posto. Integrando Slack, puoi ricevere una notifica di tutte le nuove conversazioni nel tuo account direttamente all'interno di Slack."
     webhooks:
-      name: "Webhooks"
+      name: "Webhook"
       description: "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account. Puoi utilizzare i webhooks per comunicare gli eventi alle tue app preferite, come Slack o Github. Clicca su Configura per configurare i tuoi webhook."
     dialogflow:
       name: "Dialogflow"
-      description: "Costruisci chatbots usando Dialogflow e collegali rapidamente alla tua casella di posta. Lasciate che i bot gestiscano le domande prima di consegnarle a un agente di servizio clienti."
+      description: "Costruisci chatbot usando Dialogflow e collegali rapidamente alla tua casella di posta. Lascia che i bot gestiscano le domande prima di consegnarle ad un agente del servizio clienti."
     fullcontact:
       name: "Fullcontact"
-      description: "L'integrazione di FullContact aiuta ad arricchire i profili dei visitatori. Identificare gli utenti non appena condividono il loro indirizzo email e offrono loro un servizio clienti personalizzato. Collega il tuo FullContact al tuo account condividendo la chiave API FullContent."
+      description: "L'integrazione di FullContact aiuta ad arricchire i profili dei visitatori. Identifica gli utenti non appena condividono il loro indirizzo email e offri loro un servizio clienti personalizzato. Collega FullContact al tuo account condividendo la chiave API di FullContent."
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
new file mode 100644
index 000000000..eaa7a9ce8
--- /dev/null
+++ b/config/locales/lv.yml
@@ -0,0 +1,103 @@
+#Files in the config/locales directory are used for internationalization
+#and are automatically loaded by Rails. If you want to use locales other
+#than English, add the necessary files in this directory.
+#To use the locales, use `I18n.t`:
+#I18n.t 'hello'
+#In views, this is aliased to just `t`:
+#<%= t('hello') %>
+#To use a different locale, set it with `I18n.locale`:
+#I18n.locale = :es
+#This would use the information in config/locales/es.yml.
+#The following keys must be escaped otherwise they will not be retrieved by
+#the default I18n backend:
+#true, false, on, off, yes, no
+#Instead, surround them with single quotes.
+#en:
+#'true': 'foo'
+#To learn more, please read the Rails Internationalization guide
+#available at https://guides.rubyonrails.org/i18n.html.
+lv:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+    contacts:
+      import:
+        failed: File is blank
+  reports:
+    period: Reporting period %{since} to %{until}
+    agent_csv:
+      agent_name: Agent name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    team_csv:
+      team_name: Team name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+  notifications:
+    notification_title:
+      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
+      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
+      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
+      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+  conversations:
+    messages:
+      deleted: This message was deleted
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+        pending: "Conversation was marked as pending by %{user_name}"
+        snoozed: "Conversation was snoozed by %{user_name}"
+        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+      assignee:
+        self_assigned: "%{user_name} self-assigned this conversation"
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+      team:
+        assigned: "Assigned to %{team_name} by %{user_name}"
+        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
+        removed: "Unassigned from %{team_name} by %{user_name}"
+      labels:
+        added: "%{user_name} added %{labels}"
+        removed: "%{user_name} removed %{labels}"
+      muted: "%{user_name} has muted the conversation"
+      unmuted: "%{user_name} has unmuted the conversation"
+    templates:
+      greeting_message_body: "%{account_name} typically replies in a few hours."
+      ways_to_reach_you_message_body: "Give the team a way to reach you."
+      email_input_box_message_body: "Get notified by email"
+      csat_input_message_body: "Please rate the conversation"
+    reply:
+      email:
+        header:
+          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      email_subject: "New messages on this conversation"
+      transcript_subject: "Conversation Transcript"
+    survey:
+      response: "Please rate this conversation, %{link}"
+  contacts:
+    online:
+      delete: "%{contact_name} is Online, please try again later"
+  integration_apps:
+    slack:
+      name: "Slack"
+      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+    webhooks:
+      name: "Webhooks"
+      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+    dialogflow:
+      name: "Dialogflow"
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    fullcontact:
+      name: "Fullcontact"
+      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index d92b4ba03..fcc6cbbc7 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -38,8 +38,8 @@ ml:
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
     team_csv:
-      team_name: Team name
-      conversations_count: Conversations count
+      team_name: ടീമിന്റെ പേര്
+      conversations_count: സംഭാഷണങ്ങളുടെ എണ്ണം
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
   notifications:
@@ -50,12 +50,12 @@ ml:
       conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
   conversations:
     messages:
-      deleted: This message was deleted
+      deleted: ഈ സന്ദേശം ഇല്ലാതാക്കി
     activity:
       status:
         resolved: "സംഭാഷണം %{user_name} പരിഹരിച്ചതായി അടയാളപ്പെടുത്തി"
         open: "സംഭാഷണം %{user_name} വീണ്ടും തുറന്നു"
-        pending: "Conversation was marked as pending by %{user_name}"
+        pending: "%{user_name} സംഭാഷണം തീർച്ചപ്പെടുത്താത്തതായി അടയാളപ്പെടുത്തി"
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
       assignee:

From 4c0f6c1333ef001964b336031bc326ddd235ae17 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@chatwoot.com>
Date: Mon, 7 Feb 2022 06:47:49 -0800
Subject: [PATCH 067/101] chore: Update translations (#3927)

---
 app/javascript/dashboard/i18n/locale/el/conversation.json    | 2 +-
 app/javascript/dashboard/i18n/locale/pt_BR/conversation.json | 2 +-
 app/javascript/dashboard/i18n/locale/ru/conversation.json    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index 5370ee19b..3531f4810 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -22,7 +22,7 @@
     "LOADING_CONVERSATIONS": "Φόρτωση Συζητήσεων",
     "CANNOT_REPLY": "Δεν μπορείτε να απαντήσετε εξαιτίας",
     "24_HOURS_WINDOW": "του περιορισμού των 24 ωρών",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "Αυτή η συνομιλία δεν έχει ανατεθεί σε εσάς. Θα θέλατε να αντιστοιχίσετε αυτή τη συνομιλία στον εαυτό σας;",
     "ASSIGN_TO_ME": "Ανάθεση σε μένα",
     "TWILIO_WHATSAPP_CAN_REPLY": "Μπορείτε να απαντήσετε μόνο σε αυτή τη συνομιλία χρησιμοποιώντας ένα πρότυπο μήνυμα επειδή",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "του περιορισμού των 24 ωρών",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index b8334d603..0949248c3 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -22,7 +22,7 @@
     "LOADING_CONVERSATIONS": "Carregando conversas",
     "CANNOT_REPLY": "Você não pode responder porque",
     "24_HOURS_WINDOW": "Restrições de janela de mensagem de 24 horas",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "Esta conversa não está atribuída a você. Gostaria de atribuir esta conversa a você mesmo?",
     "ASSIGN_TO_ME": "Atribuir a mim",
     "TWILIO_WHATSAPP_CAN_REPLY": "Você só pode responder a esta conversa usando um modelo de mensagem devido a",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restrições de janela de mensagem de 24 horas",
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 3e609915d..8a531ca3e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -22,7 +22,7 @@
     "LOADING_CONVERSATIONS": "Загрузка диалогов",
     "CANNOT_REPLY": "Вы не можете ответить из-за",
     "24_HOURS_WINDOW": "Ограничение на 24 часа",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "Этот разговор вам не назначен. Вы хотите назначить этот разговор себе?",
     "ASSIGN_TO_ME": "Назначить мне",
     "TWILIO_WHATSAPP_CAN_REPLY": "Вы можете ответить в этой беседе только с помощью шаблона сообщения",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Ограничение на 24 часа",

From 375d943a48dede8c24c1b57d88442c72fa891892 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Mon, 7 Feb 2022 22:14:21 +0530
Subject: [PATCH 068/101] fix: Avoid filter payload changing to null on load
 more conversations (#3926)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/helper/actionQueryGenerator.js   |  3 ++-
 .../dashboard/helper/filterQueryGenerator.js   | 18 +++++++++++++++++-
 .../helper/specs/filterQueryGenerator.spec.js  |  4 ++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/helper/actionQueryGenerator.js b/app/javascript/dashboard/helper/actionQueryGenerator.js
index f5ff7c19e..d8f57b572 100644
--- a/app/javascript/dashboard/helper/actionQueryGenerator.js
+++ b/app/javascript/dashboard/helper/actionQueryGenerator.js
@@ -1,5 +1,6 @@
 const generatePayload = data => {
-  let payload = data.map(item => {
+  const actions = JSON.parse(JSON.stringify(data));
+  let payload = actions.map(item => {
     if (Array.isArray(item.action_params)) {
       item.action_params = item.action_params.map(val => val.id);
     } else if (typeof item.values === 'object') {
diff --git a/app/javascript/dashboard/helper/filterQueryGenerator.js b/app/javascript/dashboard/helper/filterQueryGenerator.js
index 590debf03..d549c490c 100644
--- a/app/javascript/dashboard/helper/filterQueryGenerator.js
+++ b/app/javascript/dashboard/helper/filterQueryGenerator.js
@@ -1,5 +1,19 @@
+const lowerCaseValues = (operator, values) => {
+  if (operator === 'equal_to' || operator === 'not_equal_to') {
+    values = values.map(val => {
+      if (typeof val === 'string') {
+        return val.toLowerCase();
+      }
+      return val;
+    });
+  }
+  return values;
+};
+
 const generatePayload = data => {
-  let payload = data.map(item => {
+  // Make a copy of data to avoid vue data reactivity issues
+  const filters = JSON.parse(JSON.stringify(data));
+  let payload = filters.map(item => {
     if (Array.isArray(item.values)) {
       item.values = item.values.map(val => val.id);
     } else if (typeof item.values === 'object') {
@@ -9,6 +23,8 @@ const generatePayload = data => {
     } else {
       item.values = [item.values];
     }
+    // Convert all values to lowerCase if operator_type is 'equal_to' or 'not_equal_to'
+    item.values = lowerCaseValues(item.filter_operator, item.values);
     return item;
   });
   // For every query added, the query_operator is set default to and so the
diff --git a/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js b/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js
index 9120ea930..6b38b094a 100644
--- a/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js
+++ b/app/javascript/dashboard/helper/specs/filterQueryGenerator.spec.js
@@ -5,7 +5,7 @@ const testData = [
     attribute_key: 'status',
     filter_operator: 'equal_to',
     values: [
-      { id: 'pending', name: 'Pending' },
+      { id: 'PENDING', name: 'Pending' },
       { id: 'resolved', name: 'Resolved' },
     ],
     query_operator: 'and',
@@ -52,7 +52,7 @@ const finalResult = {
     {
       attribute_key: 'id',
       filter_operator: 'equal_to',
-      values: ['This is a test'],
+      values: ['this is a test'],
     },
   ],
 };

From 2a07eae69f2d180fb32c3da834d5151e8256723f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 8 Feb 2022 04:47:36 +0530
Subject: [PATCH 069/101] fix: URL encode params on Platform API call (#3929)

Add URL encoding for the params in platform API calls.

Fixes: product#307
Fixes: #2186
---
 app/controllers/platform/api/v1/users_controller.rb       | 3 ++-
 app/javascript/dashboard/routes/login/Login.vue           | 4 +++-
 spec/controllers/platform/api/v1/users_controller_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/platform/api/v1/users_controller.rb b/app/controllers/platform/api/v1/users_controller.rb
index 4ee14d0b6..960dee0e3 100644
--- a/app/controllers/platform/api/v1/users_controller.rb
+++ b/app/controllers/platform/api/v1/users_controller.rb
@@ -13,7 +13,8 @@ class Platform::Api::V1::UsersController < PlatformController
   end
 
   def login
-    render json: { url: "#{ENV['FRONTEND_URL']}/app/login?email=#{@resource.email}&sso_auth_token=#{@resource.generate_sso_auth_token}" }
+    encoded_email = ERB::Util.url_encode(@resource.email)
+    render json: { url: "#{ENV['FRONTEND_URL']}/app/login?email=#{encoded_email}&sso_auth_token=#{@resource.generate_sso_auth_token}" }
   end
 
   def show; end
diff --git a/app/javascript/dashboard/routes/login/Login.vue b/app/javascript/dashboard/routes/login/Login.vue
index c31bd5479..8c6869d7b 100644
--- a/app/javascript/dashboard/routes/login/Login.vue
+++ b/app/javascript/dashboard/routes/login/Login.vue
@@ -133,7 +133,9 @@ export default {
     login() {
       this.loginApi.showLoading = true;
       const credentials = {
-        email: this.email ? this.email : this.credentials.email,
+        email: this.email
+          ? decodeURIComponent(this.email)
+          : this.credentials.email,
         password: this.credentials.password,
         sso_auth_token: this.ssoAuthToken,
       };
diff --git a/spec/controllers/platform/api/v1/users_controller_spec.rb b/spec/controllers/platform/api/v1/users_controller_spec.rb
index f9d982cbc..cc6fe448f 100644
--- a/spec/controllers/platform/api/v1/users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/users_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'Platform Users API', type: :request do
-  let!(:user) { create(:user, custom_attributes: { test: 'test' }) }
+  let!(:user) { create(:user, email: 'dev+testing@chatwoot.com', custom_attributes: { test: 'test' }) }
 
   describe 'GET /platform/api/v1/users/{user_id}' do
     context 'when it is an unauthenticated platform app' do
@@ -71,7 +71,7 @@ RSpec.describe 'Platform Users API', type: :request do
 
         expect(response).to have_http_status(:success)
         data = JSON.parse(response.body)
-        expect(data['url']).to include('sso_auth_token')
+        expect(data['url']).to include('email=dev%2Btesting%40chatwoot.com&sso_auth_token=')
       end
     end
   end

From d891c1e7b52f9e3542d728ada0263ca88ab43b74 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 8 Feb 2022 10:11:56 +0530
Subject: [PATCH 070/101] Fixes API call failing after opening the saved filter
 (#3932)

---
 app/javascript/dashboard/components/ChatList.vue                | 2 +-
 .../routes/dashboard/contacts/components/ContactsView.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index a1651c534..74b0b9f75 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -368,7 +368,7 @@ export default {
       if (this.$route.name !== 'home') {
         this.$router.push({ name: 'home' });
       }
-      this.foldersQuery = { payload: payload };
+      this.foldersQuery = filterQueryGenerator(payload);
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
       this.fetchFilteredConversations(payload);
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
index d6cf68788..7536c0d24 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsView.vue
@@ -340,7 +340,7 @@ export default {
     },
     onApplyFilter(payload) {
       this.closeContactInfoPanel();
-      this.segmentsQuery = { payload };
+      this.segmentsQuery = filterQueryGenerator(payload);
       this.$store.dispatch('contacts/filter', {
         queryPayload: filterQueryGenerator(payload),
       });

From e2ff1b1a152bdc739851f6b85a8801c0a8c542fe Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@chatwoot.com>
Date: Mon, 7 Feb 2022 20:42:34 -0800
Subject: [PATCH 071/101] chore: Update German translations (#3928)

---
 app/javascript/dashboard/i18n/locale/de/conversation.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 5d26d9bd3..933912cd4 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -22,7 +22,7 @@
     "LOADING_CONVERSATIONS": "Gespräche laden",
     "CANNOT_REPLY": "Du kannst nicht Antworten aufgrund von",
     "24_HOURS_WINDOW": "24-Stunden-Nachrichtenfenster-Beschränkung",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "Diese Konversation ist Ihnen nicht zugeordnet. Möchten Sie dieses Gespräch sich selbst zuordnen?",
     "ASSIGN_TO_ME": "Mir zuweisen",
     "TWILIO_WHATSAPP_CAN_REPLY": "Du kannst auf diese Unterhaltung nur mit einer Vorlagen-Nachricht antworten aufgrund von",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24-Stunden-Nachrichtenfenster-Beschränkung",

From 7b2ff2f112936c0905f4ef3ef608e1cae790ac38 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 8 Feb 2022 10:38:14 +0530
Subject: [PATCH 072/101] feat: Show assignee name in folders view (#3933)

---
 app/javascript/dashboard/components/ChatList.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 74b0b9f75..4173ed438 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -245,7 +245,10 @@ export default {
       });
     },
     showAssigneeInConversationCard() {
-      return this.activeAssigneeTab === wootConstants.ASSIGNEE_TYPE.ALL;
+      return (
+        this.hasAppliedFiltersOrActiveFolders ||
+        this.activeAssigneeTab === wootConstants.ASSIGNEE_TYPE.ALL
+      );
     },
     inbox() {
       return this.$store.getters['inboxes/getInbox'](this.activeInbox);

From 4ae9ed8f945e1ab188c0cfb5f3a3f3f15b33e622 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 8 Feb 2022 16:39:19 +0530
Subject: [PATCH 073/101] chore: Assign the conversation to agent who opens the
 conversation (#3925)

---
 .../v1/accounts/conversations_controller.rb   |  6 +++++
 .../accounts/conversations_controller_spec.rb | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 22eee629e..0515eabca 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -61,6 +61,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     else
       @status = @conversation.toggle_status
     end
+    assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
   end
 
   def toggle_typing_status
@@ -93,6 +94,11 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
   end
 
+  def assign_conversation
+    @agent = Current.account.users.find(current_user.id)
+    @conversation.update_assignee(@agent)
+  end
+
   def trigger_typing_event(event, is_private)
     user = current_user.presence || @resource
     Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private)
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 56b82484f..8a874fc56 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -314,6 +314,7 @@ RSpec.describe 'Conversations API', type: :request do
 
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
+      let(:administrator) { create(:user, account: account, role: :administrator) }
 
       before do
         create(:inbox_member, user: agent, inbox: conversation.inbox)
@@ -341,6 +342,27 @@ RSpec.describe 'Conversations API', type: :request do
         expect(conversation.reload.status).to eq('open')
       end
 
+      it 'self assign if agent changes the conversation status to open' do
+        conversation.update!(status: 'pending')
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_status",
+             headers: agent.create_new_auth_token,
+             as: :json
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.status).to eq('open')
+        expect(conversation.reload.assignee_id).to eq(agent.id)
+      end
+
+      it 'disbale self assign if admin changes the conversation status to open' do
+        conversation.update!(status: 'pending')
+        conversation.update!(assignee_id: nil)
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_status",
+             headers: administrator.create_new_auth_token,
+             as: :json
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.status).to eq('open')
+        expect(conversation.reload.assignee_id).not_to eq(administrator.id)
+      end
+
       it 'toggles the conversation status to specific status when parameter is passed' do
         expect(conversation.status).to eq('open')
 

From 4e416b4d51cf6fe542379f751ee1e8e490b580b3 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswin@chatwoot.com>
Date: Tue, 8 Feb 2022 03:26:13 -0800
Subject: [PATCH 074/101] Add openssl verify mode and email encryption for smtp
 configuration (#3885)

* Add openssl verify mode and email encryption for smtp configuration
* Add spec for code coverage
---
 app/helpers/api/v1/inboxes_helper.rb          | 44 ++++++++-
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  6 +-
 .../dashboard/settings/inbox/SmtpSettings.vue | 59 ++++++++++++
 .../inbox/components/InputRadioGroup.vue      | 45 +++++++++
 .../inbox/components/SingleSelectDropdown.vue | 44 +++++++++
 .../conversation_reply_mailer_helper.rb       |  2 +
 app/models/channel/email.rb                   |  5 +-
 app/views/api/v1/models/_inbox.json.jbuilder  |  3 +
 ...d_open_ssl_verify_mode_to_channel_email.rb |  8 ++
 db/schema.rb                                  |  2 +
 .../v1/accounts/inboxes_controller_spec.rb    | 92 +++++++++++++------
 11 files changed, 280 insertions(+), 30 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/components/SingleSelectDropdown.vue
 create mode 100644 db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb

diff --git a/app/helpers/api/v1/inboxes_helper.rb b/app/helpers/api/v1/inboxes_helper.rb
index 08f000cc6..8cdf8d987 100644
--- a/app/helpers/api/v1/inboxes_helper.rb
+++ b/app/helpers/api/v1/inboxes_helper.rb
@@ -26,8 +26,48 @@ module Api::V1::InboxesHelper
   def validate_smtp(channel_data)
     return unless channel_data.key?('smtp_enabled') && channel_data[:smtp_enabled]
 
-    smtp = Net::SMTP.start(channel_data[:smtp_address], channel_data[:smtp_port], channel_data[:smtp_domain], channel_data[:smtp_email],
-                           channel_data[:smtp_password], :login)
+    smtp = Net::SMTP.new(channel_data[:smtp_address], channel_data[:smtp_port])
+
+    set_smtp_encryption(channel_data, smtp)
+
+    smtp.start(channel_data[:smtp_domain], channel_data[:smtp_email], channel_data[:smtp_password], :login)
     smtp.finish unless smtp&.nil?
   end
+
+  def set_smtp_encryption(channel_data, smtp)
+    if channel_data[:smtp_enable_ssl_tls]
+      set_enable_tls(channel_data, smtp)
+    elsif channel_data[:smtp_enable_starttls_auto]
+      set_enable_starttls_auto(channel_data, smtp)
+    end
+  end
+
+  def set_enable_starttls_auto(channel_data, smtp)
+    return unless smtp.respond_to?(:enable_starttls_auto)
+
+    if channel_data[:smtp_openssl_verify_mode]
+      context = enable_openssl_mode(channel_data[:smtp_openssl_verify_mode])
+      smtp.enable_starttls_auto(context)
+    else
+      smtp.enable_starttls_auto
+    end
+  end
+
+  def set_enable_tls(channel_data, smtp)
+    return unless smtp.respond_to?(:enable_tls)
+
+    if channel_data[:smtp_openssl_verify_mode]
+      context = enable_openssl_mode(channel_data[:smtp_openssl_verify_mode])
+      smtp.enable_tls(context)
+    else
+      smtp.enable_tls
+    end
+  end
+
+  def enable_openssl_mode(smtp_openssl_verify_mode)
+    openssl_verify_mode = "OpenSSL::SSL::VERIFY_#{smtp_openssl_verify_mode.upcase}".constantize if smtp_openssl_verify_mode.is_a?(String)
+    context = Net::SMTP.default_ssl_context
+    context.verify_mode = openssl_verify_mode
+    context
+  end
 end
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 86cf1a3c3..27172cdba 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -522,7 +522,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
index 009e3cbb3..21a8955ef 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
@@ -57,6 +57,18 @@
             :placeholder="$t('INBOX_MGMT.SMTP.DOMAIN.PLACE_HOLDER')"
             @blur="$v.domain.$touch"
           />
+          <input-radio-group
+            :label="$t('INBOX_MGMT.SMTP.ENCRYPTION')"
+            :items="encryptionProtocols"
+            :action="handleEncryptionChange"
+          />
+          <single-select-dropdown
+            class="medium-9 columns"
+            :label="$t('INBOX_MGMT.SMTP.OPEN_SSL_VERIFY_MODE')"
+            :selected="openSSLVerifyMode"
+            :options="openSSLVerifyModes"
+            :action="handleSSLModeChange"
+          />
         </div>
         <woot-submit-button
           :button-text="$t('INBOX_MGMT.SMTP.UPDATE')"
@@ -73,10 +85,14 @@ import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import SettingsSection from 'dashboard/components/SettingsSection';
 import { required, minLength, email } from 'vuelidate/lib/validators';
+import InputRadioGroup from './components/InputRadioGroup';
+import SingleSelectDropdown from './components/SingleSelectDropdown';
 
 export default {
   components: {
     SettingsSection,
+    InputRadioGroup,
+    SingleSelectDropdown,
   },
   mixins: [alertMixin],
   props: {
@@ -93,6 +109,19 @@ export default {
       email: '',
       password: '',
       domain: '',
+      ssl: false,
+      starttls: true,
+      openSSLVerifyMode: 'none',
+      encryptionProtocols: [
+        { id: 'ssl', title: 'SSL/TLS', checked: false },
+        { id: 'starttls', title: 'STARTTLS', checked: true },
+      ],
+      openSSLVerifyModes: [
+        { key: 1, value: 'none' },
+        { key: 2, value: 'peer' },
+        { key: 3, value: 'client_once' },
+        { key: 4, value: 'fail_if_no_peer_cert' },
+      ],
     };
   },
   validations: {
@@ -125,6 +154,9 @@ export default {
         smtp_email,
         smtp_password,
         smtp_domain,
+        smtp_enable_starttls_auto,
+        smtp_enable_ssl_tls,
+        smtp_openssl_verify_mode,
       } = this.inbox;
       this.isSMTPEnabled = smtp_enabled;
       this.address = smtp_address;
@@ -132,6 +164,30 @@ export default {
       this.email = smtp_email;
       this.password = smtp_password;
       this.domain = smtp_domain;
+      this.starttls = smtp_enable_starttls_auto;
+      this.ssl = smtp_enable_ssl_tls;
+      this.openSSLVerifyMode = smtp_openssl_verify_mode;
+
+      this.encryptionProtocols = [
+        { id: 'ssl', title: 'SSL/TLS', checked: smtp_enable_ssl_tls },
+        {
+          id: 'starttls',
+          title: 'STARTTLS',
+          checked: smtp_enable_starttls_auto,
+        },
+      ];
+    },
+    handleEncryptionChange(encryption) {
+      if (encryption.id === 'ssl') {
+        this.ssl = true;
+        this.starttls = false;
+      } else {
+        this.ssl = false;
+        this.starttls = true;
+      }
+    },
+    handleSSLModeChange(mode) {
+      this.openSSLVerifyMode = mode;
     },
     async updateInbox() {
       try {
@@ -145,6 +201,9 @@ export default {
             smtp_email: this.email,
             smtp_password: this.password,
             smtp_domain: this.domain,
+            smtp_enable_ssl_tls: this.ssl,
+            smtp_enable_starttls_auto: this.starttls,
+            smtp_openssl_verify_mode: this.openSSLVerifyMode,
           },
         };
         await this.$store.dispatch('inboxes/updateInboxSMTP', payload);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue
new file mode 100644
index 000000000..3326261fd
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InputRadioGroup.vue
@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <label class="radio-group-label">{{ label }}</label>
+    <div class="radio-group">
+      <div v-for="item in items" :key="item.id">
+        <input
+          name="radio-input"
+          type="radio"
+          :checked="item.checked"
+          @change="action(item)"
+        />
+        <label>{{ item.title }}</label>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    label: {
+      type: String,
+      default: '',
+    },
+    items: {
+      type: Array,
+      default: () => [],
+    },
+    action: {
+      type: Function,
+      default: () => {},
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.radio-group-label {
+  margin-bottom: var(--space-small);
+}
+.radio-group {
+  display: flex;
+  align-items: center;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SingleSelectDropdown.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SingleSelectDropdown.vue
new file mode 100644
index 000000000..850b5a863
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SingleSelectDropdown.vue
@@ -0,0 +1,44 @@
+<template>
+  <div>
+    <label for="dropdown-select">
+      {{ label }}
+    </label>
+    <select
+      id="dropdown-select"
+      v-model="value"
+      name="dropdown-select"
+      @change="action(value)"
+    >
+      <option v-for="option in options" :key="option.key">
+        {{ option.value }}
+      </option>
+    </select>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    label: {
+      type: String,
+      default: '',
+    },
+    options: {
+      type: Array,
+      default: () => [],
+    },
+    selected: {
+      type: String,
+      default: '',
+    },
+    action: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      value: this.selected,
+    };
+  },
+};
+</script>
diff --git a/app/mailers/conversation_reply_mailer_helper.rb b/app/mailers/conversation_reply_mailer_helper.rb
index a9feb0c72..a8e5695f4 100644
--- a/app/mailers/conversation_reply_mailer_helper.rb
+++ b/app/mailers/conversation_reply_mailer_helper.rb
@@ -29,7 +29,9 @@ module ConversationReplyMailerHelper
       user_name: @channel.smtp_email,
       password: @channel.smtp_password,
       domain: @channel.smtp_domain,
+      tls: @channel.smtp_enable_ssl_tls,
       enable_starttls_auto: @channel.smtp_enable_starttls_auto,
+      openssl_verify_mode: @channel.smtp_openssl_verify_mode,
       authentication: @channel.smtp_authentication
     }
 
diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb
index 092a9a101..3a25c3798 100644
--- a/app/models/channel/email.rb
+++ b/app/models/channel/email.rb
@@ -16,8 +16,10 @@
 #  smtp_authentication       :string           default("login")
 #  smtp_domain               :string           default("")
 #  smtp_email                :string           default("")
+#  smtp_enable_ssl_tls       :boolean          default(FALSE)
 #  smtp_enable_starttls_auto :boolean          default(TRUE)
 #  smtp_enabled              :boolean          default(FALSE)
+#  smtp_openssl_verify_mode  :string           default("none")
 #  smtp_password             :string           default("")
 #  smtp_port                 :integer          default(0)
 #  created_at                :datetime         not null
@@ -35,7 +37,8 @@ class Channel::Email < ApplicationRecord
 
   self.table_name = 'channel_email'
   EDITABLE_ATTRS = [:email, :imap_enabled, :imap_email, :imap_password, :imap_address, :imap_port, :imap_enable_ssl, :imap_inbox_synced_at,
-                    :smtp_enabled, :smtp_email, :smtp_password, :smtp_address, :smtp_port, :smtp_domain].freeze
+                    :smtp_enabled, :smtp_email, :smtp_password, :smtp_address, :smtp_port, :smtp_domain, :smtp_enable_starttls_auto,
+                    :smtp_enable_ssl_tls, :smtp_openssl_verify_mode].freeze
 
   validates :email, uniqueness: true
   validates :forward_to_email, uniqueness: true
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 587dfd71c..671d52072 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -67,6 +67,9 @@ if resource.email?
   json.smtp_port resource.channel.try(:smtp_port)
   json.smtp_enabled resource.channel.try(:smtp_enabled)
   json.smtp_domain resource.channel.try(:smtp_domain)
+  json.smtp_enable_ssl_tls resource.channel.try(:smtp_enable_ssl_tls)
+  json.smtp_enable_starttls_auto resource.channel.try(:smtp_enable_starttls_auto)
+  json.smtp_openssl_verify_mode resource.channel.try(:smtp_openssl_verify_mode)
 end
 
 ## API Channel Attributes
diff --git a/db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb b/db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb
new file mode 100644
index 000000000..77cddc7c5
--- /dev/null
+++ b/db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb
@@ -0,0 +1,8 @@
+class AddOpenSslVerifyModeToChannelEmail < ActiveRecord::Migration[6.1]
+  def change
+    change_table :channel_email, bulk: true do |t|
+      t.string :smtp_openssl_verify_mode, default: 'none'
+      t.boolean :smtp_enable_ssl_tls, default: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 081dbdc3a..5c16d1e87 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -202,6 +202,8 @@ ActiveRecord::Schema.define(version: 2022_01_31_081750) do
     t.string "smtp_domain", default: ""
     t.boolean "smtp_enable_starttls_auto", default: true
     t.string "smtp_authentication", default: "login"
+    t.string "smtp_openssl_verify_mode", default: "none"
+    t.boolean "smtp_enable_ssl_tls", default: false
     t.index ["email"], name: "index_channel_email_on_email", unique: true
     t.index ["forward_to_email"], name: "index_channel_email_on_forward_to_email", unique: true
   end
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 5dc184b8c..7ebe8434a 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -437,32 +437,6 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(email_channel.reload.imap_port).to eq(993)
       end
 
-      it 'updates email inbox with smtp when administrator' do
-        email_channel = create(:channel_email, account: account)
-        email_inbox = create(:inbox, channel: email_channel, account: account)
-
-        smtp_connection = double
-        allow(smtp_connection).to receive(:finish).and_return(true)
-        allow(Net::SMTP).to receive(:start).and_return(smtp_connection)
-
-        patch "/api/v1/accounts/#{account.id}/inboxes/#{email_inbox.id}",
-              headers: admin.create_new_auth_token,
-              params: {
-                channel: {
-                  smtp_enabled: true,
-                  smtp_address: 'smtp.gmail.com',
-                  smtp_port: 587,
-                  smtp_email: 'smtptest@gmail.com'
-                }
-              },
-              as: :json
-
-        expect(response).to have_http_status(:success)
-        expect(email_channel.reload.smtp_enabled).to be true
-        expect(email_channel.reload.smtp_address).to eq('smtp.gmail.com')
-        expect(email_channel.reload.smtp_port).to eq(587)
-      end
-
       it 'updates avatar when administrator' do
         # no avatar before upload
         expect(inbox.avatar.attached?).to eq(false)
@@ -501,6 +475,72 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(inbox.reload.allow_messages_after_resolved).to be_falsey
       end
     end
+
+    context 'when an authenticated user updates email inbox' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+      let(:email_channel) { create(:channel_email, account: account) }
+      let(:email_inbox) { create(:inbox, channel: email_channel, account: account) }
+
+      it 'updates smtp configuration with starttls encryption' do
+        smtp_connection = double
+        allow(smtp_connection).to receive(:start).and_return(true)
+        allow(smtp_connection).to receive(:finish).and_return(true)
+        allow(smtp_connection).to receive(:respond_to?).and_return(true)
+        allow(smtp_connection).to receive(:enable_starttls_auto).and_return(true)
+        allow(Net::SMTP).to receive(:new).and_return(smtp_connection)
+
+        patch "/api/v1/accounts/#{account.id}/inboxes/#{email_inbox.id}",
+              headers: admin.create_new_auth_token,
+              params: {
+                channel: {
+                  smtp_enabled: true,
+                  smtp_address: 'smtp.gmail.com',
+                  smtp_port: 587,
+                  smtp_email: 'smtptest@gmail.com',
+                  smtp_enable_starttls_auto: true,
+                  smtp_openssl_verify_mode: 'peer'
+                }
+              },
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(email_channel.reload.smtp_enabled).to be true
+        expect(email_channel.reload.smtp_address).to eq('smtp.gmail.com')
+        expect(email_channel.reload.smtp_port).to eq(587)
+        expect(email_channel.reload.smtp_enable_starttls_auto).to be true
+        expect(email_channel.reload.smtp_openssl_verify_mode).to eq('peer')
+      end
+
+      it 'updates smtp configuration with ssl/tls encryption' do
+        smtp_connection = double
+        allow(smtp_connection).to receive(:start).and_return(true)
+        allow(smtp_connection).to receive(:finish).and_return(true)
+        allow(smtp_connection).to receive(:respond_to?).and_return(true)
+        allow(smtp_connection).to receive(:enable_tls).and_return(true)
+        allow(Net::SMTP).to receive(:new).and_return(smtp_connection)
+
+        patch "/api/v1/accounts/#{account.id}/inboxes/#{email_inbox.id}",
+              headers: admin.create_new_auth_token,
+              params: {
+                channel: {
+                  smtp_enabled: true,
+                  smtp_address: 'smtp.gmail.com',
+                  smtp_email: 'smtptest@gmail.com',
+                  smtp_port: 587,
+                  smtp_enable_ssl_tls: true,
+                  smtp_openssl_verify_mode: 'none'
+                }
+              },
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(email_channel.reload.smtp_enabled).to be true
+        expect(email_channel.reload.smtp_address).to eq('smtp.gmail.com')
+        expect(email_channel.reload.smtp_port).to eq(587)
+        expect(email_channel.reload.smtp_enable_ssl_tls).to be true
+        expect(email_channel.reload.smtp_openssl_verify_mode).to eq('none')
+      end
+    end
   end
 
   describe 'GET /api/v1/accounts/{account.id}/inboxes/{inbox.id}/agent_bot' do

From 0ec3a560414be178f1f5064b29031693bf255658 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 9 Feb 2022 14:35:18 +0530
Subject: [PATCH 075/101] fix: Blank page after deleting contact (#3948)

---
 .../routes/dashboard/conversation/contact/ContactInfo.vue      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 4d2d98413..4a58d8a54 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -266,6 +266,9 @@ export default {
         await this.$store.dispatch('contacts/delete', id);
         this.$emit('panel-close');
         this.showAlert(this.$t('DELETE_CONTACT.API.SUCCESS_MESSAGE'));
+        if (this.$route.name !== 'contacts_dashboard') {
+          this.$router.push({ name: 'contacts_dashboard' });
+        }
       } catch (error) {
         this.showAlert(
           error.message

From 4201b573157c954d57a4c9311483653ac6250795 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 10 Feb 2022 12:48:22 +0530
Subject: [PATCH 076/101] fix: Fixes console error with image component in
 widget (#3955)

---
 app/javascript/widget/components/ImageBubble.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/javascript/widget/components/ImageBubble.vue b/app/javascript/widget/components/ImageBubble.vue
index 2bbd65c8f..8bf078400 100644
--- a/app/javascript/widget/components/ImageBubble.vue
+++ b/app/javascript/widget/components/ImageBubble.vue
@@ -28,6 +28,9 @@ export default {
     onImgError() {
       this.$emit('error');
     },
+    onClick() {
+      this.$emit('click');
+    },
   },
 };
 </script>

From e9a162e71aedfd4afd6ebf4946a25e3cabf6cb84 Mon Sep 17 00:00:00 2001
From: Robert Guthrie <rguthrie@gmail.com>
Date: Fri, 11 Feb 2022 02:50:30 +1300
Subject: [PATCH 077/101] feat: Prefer reply-to over from in email channels
 (#3837)

Co-authored-by: root <root@support.loomio.com>
---
 app/presenters/mail_presenter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index d406b81be..4ad650db8 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -91,11 +91,11 @@ class MailPresenter < SimpleDelegator
 
   def from
     # changing to downcase to avoid case mismatch while finding contact
-    @mail.from.map(&:downcase)
+    (@mail.reply_to.presence || @mail.from).map(&:downcase)
   end
 
   def sender_name
-    Mail::Address.new(@mail[:from].value).name
+    Mail::Address.new((@mail[:reply_to] || @mail[:from]).value).name
   end
 
   def original_sender

From 1115bd18ed7f7b92eba713e38eed9a2689e72e8d Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 11 Feb 2022 07:15:07 +0530
Subject: [PATCH 078/101] fix: Icon colors are not recognizable in bubble
 (#3957)

---
 .../components/widgets/conversation/bubble/Actions.vue      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 556ec6ae4..04149a7e2 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -137,10 +137,10 @@ export default {
     .time {
       color: var(--w-100);
     }
-  }
 
-  .action--icon {
-    color: var(--white);
+    .action--icon {
+      color: var(--white);
+    }
   }
 }
 

From ba7f387ddef741d9b9cf494d47a920adad6dcbc2 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 11 Feb 2022 08:38:42 +0530
Subject: [PATCH 079/101] chore: Reduces clutter in inbox settings page (#3960)

* chore: Reduces clutter in inbox settings page

* Fix spacing issues

Co-authored-by: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../dashboard/settings/inbox/Settings.vue     | 73 ++++++++++++-------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 3cabb96b7..645a0990a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -22,13 +22,14 @@
         <woot-avatar-uploader
           :label="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_AVATAR.LABEL')"
           :src="avatarUrl"
+          class="settings-item"
           delete-avatar
           @change="handleImageUpload"
           @onAvatarDelete="handleAvatarDelete"
         />
         <woot-input
           v-model.trim="selectedInboxName"
-          class="medium-9 columns"
+          class="medium-9 columns settings-item"
           :label="inboxNameLabel"
           :placeholder="inboxNamePlaceHolder"
         />
@@ -47,7 +48,7 @@
         <woot-input
           v-if="isAPIInbox"
           v-model.trim="webhookUrl"
-          class="medium-9 columns"
+          class="medium-9 columns settings-item"
           :class="{ error: $v.webhookUrl.$error }"
           :label="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WEBHOOK_URL.LABEL')
@@ -65,7 +66,7 @@
         <woot-input
           v-if="isAWebWidgetInbox"
           v-model.trim="channelWebsiteUrl"
-          class="medium-9 columns"
+          class="medium-9 columns settings-item"
           :label="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_DOMAIN.LABEL')"
           :placeholder="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_DOMAIN.PLACEHOLDER')
@@ -74,7 +75,7 @@
         <woot-input
           v-if="isAWebWidgetInbox"
           v-model.trim="channelWelcomeTitle"
-          class="medium-9 columns"
+          class="medium-9 columns settings-item"
           :label="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TITLE.LABEL')
           "
@@ -88,7 +89,7 @@
         <woot-input
           v-if="isAWebWidgetInbox"
           v-model.trim="channelWelcomeTagline"
-          class="medium-9 columns"
+          class="medium-9 columns settings-item"
           :label="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TAGLINE.LABEL')
           "
@@ -99,12 +100,12 @@
           "
         />
 
-        <label v-if="isAWebWidgetInbox" class="medium-9 columns">
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.WIDGET_COLOR.LABEL') }}
           <woot-color-picker v-model="inbox.widget_color" />
         </label>
 
-        <label class="medium-9 columns">
+        <label class="medium-9 columns settings-item">
           {{
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.LABEL')
           }}
@@ -132,20 +133,23 @@
             }}
           </p>
         </label>
-        <greetings-editor
-          v-if="greetingEnabled"
-          v-model.trim="greetingMessage"
-          :label="
-            $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.LABEL')
-          "
-          :placeholder="
-            $t(
-              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.PLACEHOLDER'
-            )
-          "
-          :richtext="!textAreaChannels"
-        />
-        <label class="medium-9 columns">
+        <div v-if="greetingEnabled" class="settings-item">
+          <greetings-editor
+            v-model.trim="greetingMessage"
+            :label="
+              $t(
+                'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.LABEL'
+              )
+            "
+            :placeholder="
+              $t(
+                'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.PLACEHOLDER'
+              )
+            "
+            :richtext="!textAreaChannels"
+          />
+        </div>
+        <label class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.REPLY_TIME.TITLE') }}
           <select v-model="replyTime">
             <option key="in_a_few_minutes" value="in_a_few_minutes">
@@ -168,7 +172,7 @@
           </p>
         </label>
 
-        <label v-if="isAWebWidgetInbox" class="medium-9 columns">
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_EMAIL_COLLECT_BOX') }}
           <select v-model="emailCollectEnabled">
             <option :value="true">
@@ -185,7 +189,7 @@
           </p>
         </label>
 
-        <label class="medium-9 columns">
+        <label class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT') }}
           <select v-model="autoAssignment">
             <option :value="true">
@@ -200,7 +204,7 @@
           </p>
         </label>
 
-        <label class="medium-9 columns">
+        <label class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_CSAT') }}
           <select v-model="csatSurveyEnabled">
             <option :value="true">
@@ -215,7 +219,7 @@
           </p>
         </label>
 
-        <label v-if="isAWebWidgetInbox" class="medium-9 columns">
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ALLOW_MESSAGES_AFTER_RESOLVED') }}
           <select v-model="allowMessagesAfterResolved">
             <option :value="true">
@@ -234,7 +238,7 @@
           </p>
         </label>
 
-        <label v-if="isAWebWidgetInbox" class="medium-9 columns">
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_CONTINUITY_VIA_EMAIL') }}
           <select v-model="continuityViaEmail">
             <option :value="true">
@@ -256,7 +260,10 @@
         <label v-if="isAWebWidgetInbox">
           {{ $t('INBOX_MGMT.FEATURES.LABEL') }}
         </label>
-        <div v-if="isAWebWidgetInbox" class="widget--feature-flag">
+        <div
+          v-if="isAWebWidgetInbox"
+          class="widget--feature-flag settings-item"
+        >
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -267,7 +274,7 @@
             {{ $t('INBOX_MGMT.FEATURES.DISPLAY_FILE_PICKER') }}
           </label>
         </div>
-        <div v-if="isAWebWidgetInbox">
+        <div v-if="isAWebWidgetInbox" class="settings-item settings-item">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -750,4 +757,14 @@ export default {
 .widget--feature-flag {
   padding-top: var(--space-small);
 }
+
+.settings-item {
+  padding-bottom: var(--space-normal);
+
+  .help-text {
+    font-style: normal;
+    color: var(--b-500);
+    padding-bottom: var(--space-smaller);
+  }
+}
 </style>

From 2da618bd5e2fe055d98cfe1b6700fe2c9faae09f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 14 Feb 2022 09:44:25 +0530
Subject: [PATCH 080/101] feat: Add `conversation_created` event in webhooks
 (#3949)

---
 app/listeners/webhook_listener.rb       |  7 ++++
 spec/listeners/webhook_listener_spec.rb | 47 +++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index 6463f29b6..98a694f2c 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -22,6 +22,13 @@ class WebhookListener < BaseListener
     deliver_webhook_payloads(payload, inbox)
   end
 
+  def conversation_created(event)
+    conversation = extract_conversation_and_account(event)[0]
+    inbox = conversation.inbox
+    payload = conversation.webhook_data.merge(event: __method__.to_s)
+    deliver_webhook_payloads(payload, inbox)
+  end
+
   def message_created(event)
     message = extract_message_and_account(event)[0]
     inbox = message.inbox
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index cb06dd6c0..0bebc8d15 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -10,7 +10,8 @@ describe WebhookListener do
     create(:message, message_type: 'outgoing',
                      account: account, inbox: inbox, conversation: conversation)
   end
-  let!(:event) { Events::Base.new(event_name, Time.zone.now, message: message) }
+  let!(:message_created_event) { Events::Base.new(event_name, Time.zone.now, message: message) }
+  let!(:conversation_created_event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
 
   describe '#message_created' do
     let(:event_name) { :'message.created' }
@@ -18,7 +19,7 @@ describe WebhookListener do
     context 'when webhook is not configured' do
       it 'does not trigger webhook' do
         expect(WebhookJob).to receive(:perform_later).exactly(0).times
-        listener.message_created(event)
+        listener.message_created(message_created_event)
       end
     end
 
@@ -26,7 +27,7 @@ describe WebhookListener do
       it 'triggers webhook' do
         webhook = create(:webhook, inbox: inbox, account: account)
         expect(WebhookJob).to receive(:perform_later).with(webhook.url, message.webhook_data.merge(event: 'message_created')).once
-        listener.message_created(event)
+        listener.message_created(message_created_event)
       end
     end
 
@@ -64,4 +65,44 @@ describe WebhookListener do
       end
     end
   end
+
+  describe '#conversation_created' do
+    let(:event_name) { :'conversation.created' }
+
+    context 'when webhook is not configured' do
+      it 'does not trigger webhook' do
+        expect(WebhookJob).to receive(:perform_later).exactly(0).times
+        listener.conversation_created(conversation_created_event)
+      end
+    end
+
+    context 'when webhook is configured' do
+      it 'triggers webhook' do
+        webhook = create(:webhook, inbox: inbox, account: account)
+        expect(WebhookJob).to receive(:perform_later).with(webhook.url, conversation.webhook_data.merge(event: 'conversation_created')).once
+        listener.conversation_created(conversation_created_event)
+      end
+    end
+
+    context 'when inbox is an API Channel' do
+      it 'triggers webhook if webhook_url is present' do
+        channel_api = create(:channel_api, account: account)
+        api_inbox = channel_api.inbox
+        api_conversation = create(:conversation, account: account, inbox: api_inbox, assignee: user)
+        api_event = Events::Base.new(event_name, Time.zone.now, conversation: api_conversation)
+        expect(WebhookJob).to receive(:perform_later).with(channel_api.webhook_url,
+                                                           api_conversation.webhook_data.merge(event: 'conversation_created')).once
+        listener.conversation_created(api_event)
+      end
+
+      it 'does not trigger webhook if webhook_url is not present' do
+        channel_api = create(:channel_api, webhook_url: nil, account: account)
+        api_inbox = channel_api.inbox
+        api_conversation = create(:conversation, account: account, inbox: api_inbox, assignee: user)
+        api_event = Events::Base.new(event_name, Time.zone.now, conversation: api_conversation)
+        expect(WebhookJob).not_to receive(:perform_later)
+        listener.conversation_created(api_event)
+      end
+    end
+  end
 end

From 25001689ecb2ad46cd879936946104fba2e35bee Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 14 Feb 2022 11:20:31 +0530
Subject: [PATCH 081/101] fix: Use to_i in campaign scheduled_at key (#3968)

---
 app/views/api/v1/models/_campaign.json.jbuilder               | 2 +-
 spec/controllers/api/v1/accounts/campaigns_controller_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/api/v1/models/_campaign.json.jbuilder b/app/views/api/v1/models/_campaign.json.jbuilder
index ca1aa9e90..edafd98f9 100644
--- a/app/views/api/v1/models/_campaign.json.jbuilder
+++ b/app/views/api/v1/models/_campaign.json.jbuilder
@@ -13,7 +13,7 @@ json.campaign_status resource.campaign_status
 json.enabled resource.enabled
 json.campaign_type resource.campaign_type
 if resource.campaign_type == 'one_off'
-  json.scheduled_at resource.scheduled_at
+  json.scheduled_at resource.scheduled_at.to_i
   json.audience resource.audience
 end
 json.trigger_rules resource.trigger_rules
diff --git a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
index 9f2175007..e4036ee5a 100644
--- a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
@@ -145,6 +145,7 @@ RSpec.describe 'Campaigns API', type: :request do
         response_data = JSON.parse(response.body, symbolize_names: true)
         expect(response_data[:campaign_type]).to eq('one_off')
         expect(response_data[:scheduled_at].present?).to eq true
+        expect(response_data[:scheduled_at]).to eq(2.days.from_now.to_i)
         expect(response_data[:audience].pluck(:id)).to include(label1.id, label2.id)
       end
     end

From 74d9203868fff879b09e2ed04743cb0963823ef0 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 14 Feb 2022 15:46:20 +0530
Subject: [PATCH 082/101] feat: Show the sender email address (#3974)

---
 .../components/widgets/conversation/bubble/MailHead.vue   | 8 ++++++++
 app/javascript/dashboard/i18n/locale/en/conversation.json | 1 +
 2 files changed, 9 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue
index 6293e86c8..43112a5c8 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue
@@ -4,6 +4,10 @@
     class="message__mail-head"
     :class="{ 'is-incoming': isIncoming }"
   >
+    <div v-if="fromMail" class="meta-wrap">
+      <span class="message__content--type">{{ $t('EMAIL_HEADER.FROM') }}:</span>
+      <span>{{ fromMail }}</span>
+    </div>
     <div v-if="toMails" class="meta-wrap">
       <span class="message__content--type">{{ $t('EMAIL_HEADER.TO') }}:</span>
       <span>{{ toMails }}</span>
@@ -46,6 +50,10 @@ export default {
     },
   },
   computed: {
+    fromMail() {
+      const from = this.emailAttributes.from;
+      return from.join(', ');
+    },
     toMails() {
       const to = this.emailAttributes.to || [];
       return to.join(', ');
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index c545502ec..77a273ead 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",

From 2c15d5b4f3445691a7b1ae734001b3ce3fccc3a1 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 14 Feb 2022 15:52:15 +0530
Subject: [PATCH 083/101] fix: Custom attribute not getting changed on
 conversations (#3965)

---
 .../dashboard/components/CustomAttribute.vue  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/javascript/dashboard/components/CustomAttribute.vue b/app/javascript/dashboard/components/CustomAttribute.vue
index 41773b125..b9b769c44 100644
--- a/app/javascript/dashboard/components/CustomAttribute.vue
+++ b/app/javascript/dashboard/components/CustomAttribute.vue
@@ -141,16 +141,6 @@ export default {
       editedValue: null,
     };
   },
-  validations() {
-    if (this.isAttributeTypeLink) {
-      return {
-        editedValue: { required, url },
-      };
-    }
-    return {
-      editedValue: { required },
-    };
-  },
 
   computed: {
     formattedValue() {
@@ -209,6 +199,23 @@ export default {
       return this.editedValue;
     },
   },
+  watch: {
+    value() {
+      this.isEditing = false;
+      this.editedValue = this.value;
+    },
+  },
+
+  validations() {
+    if (this.isAttributeTypeLink) {
+      return {
+        editedValue: { required, url },
+      };
+    }
+    return {
+      editedValue: { required },
+    };
+  },
   mounted() {
     this.editedValue = this.formattedValue;
     bus.$on(BUS_EVENTS.FOCUS_CUSTOM_ATTRIBUTE, focusAttributeKey => {

From edd93ca4a3ebf20a1f140094cd5e4da90e541928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 15:53:13 +0530
Subject: [PATCH 084/101] chore(deps): bump follow-redirects from 1.14.7 to
 1.14.8 (#3970)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5487eaab2..f296da282 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6921,9 +6921,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-in@^1.0.2:
   version "1.0.2"

From 3d73d8935a3739f38446b08357a9e760f6cc98d8 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 14 Feb 2022 15:55:08 +0530
Subject: [PATCH 085/101] feat: Add the ability for a super admin to define
 account limits (#3946)

Fixes: #3773
---
 .../api/v1/accounts/inboxes_controller.rb     |  7 +++++++
 .../super_admin/accounts_controller.rb        | 10 ++++-----
 app/dashboards/account_dashboard.rb           | 18 +++++++++++-----
 app/fields/enterprise/account_limits_field.rb |  7 +++++++
 app/models/account.rb                         |  9 ++++++--
 .../account_limits_field/_form.html.erb       |  9 ++++++++
 .../account_limits_field/_index.html.erb      |  1 +
 .../account_limits_field/_show.html.erb       |  3 +++
 enterprise/app/models/enterprise/account.rb   | 21 +++++++++++++++++--
 9 files changed, 71 insertions(+), 14 deletions(-)
 create mode 100644 app/fields/enterprise/account_limits_field.rb
 create mode 100644 app/views/fields/account_limits_field/_form.html.erb
 create mode 100644 app/views/fields/account_limits_field/_index.html.erb
 create mode 100644 app/views/fields/account_limits_field/_show.html.erb

diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 62a471cda..e0c963d25 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -2,6 +2,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   include Api::V1::InboxesHelper
   before_action :fetch_inbox, except: [:index, :create]
   before_action :fetch_agent_bot, only: [:set_agent_bot]
+  before_action :validate_limit, only: [:create]
   # we are already handling the authorization in fetch inbox
   before_action :check_authorization, except: [:show]
 
@@ -143,4 +144,10 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
       []
     end
   end
+
+  def validate_limit
+    return unless Current.account.inboxes.count >= Current.account.usage_limits[:inboxes]
+
+    render_payment_required('Account limit exceeded. Upgrade to a higher plan')
+  end
 end
diff --git a/app/controllers/super_admin/accounts_controller.rb b/app/controllers/super_admin/accounts_controller.rb
index 4d35fa1d8..28cae96b0 100644
--- a/app/controllers/super_admin/accounts_controller.rb
+++ b/app/controllers/super_admin/accounts_controller.rb
@@ -33,11 +33,11 @@ class SuperAdmin::AccountsController < SuperAdmin::ApplicationController
   # empty values into nil values. It uses other APIs such as `resource_class`
   # and `dashboard`:
   #
-  # def resource_params
-  #   params.require(resource_class.model_name.param_key).
-  #     permit(dashboard.permitted_attributes).
-  #     transform_values { |value| value == "" ? nil : value }
-  # end
+  def resource_params
+    permitted_params = super
+    permitted_params[:limits] = permitted_params[:limits].to_h.compact
+    permitted_params
+  end
 
   # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
   # for more information
diff --git a/app/dashboards/account_dashboard.rb b/app/dashboards/account_dashboard.rb
index 3cc35d0d3..408589597 100644
--- a/app/dashboards/account_dashboard.rb
+++ b/app/dashboards/account_dashboard.rb
@@ -7,6 +7,8 @@ class AccountDashboard < Administrate::BaseDashboard
   # Each different type represents an Administrate::Field object,
   # which determines how the attribute is displayed
   # on pages throughout the dashboard.
+
+  enterprise_attribute_types = ChatwootApp.enterprise? ? { limits: Enterprise::AccountLimitsField } : {}
   ATTRIBUTE_TYPES = {
     id: Field::Number,
     name: Field::String,
@@ -16,7 +18,7 @@ class AccountDashboard < Administrate::BaseDashboard
     conversations: CountField,
     locale: Field::Select.with_options(collection: LANGUAGES_CONFIG.map { |_x, y| y[:iso_639_1_code] }),
     account_users: Field::HasMany
-  }.freeze
+  }.merge(enterprise_attribute_types).freeze
 
   # COLLECTION_ATTRIBUTES
   # an array of attributes that will be displayed on the model's index page.
@@ -33,7 +35,8 @@ class AccountDashboard < Administrate::BaseDashboard
 
   # SHOW_PAGE_ATTRIBUTES
   # an array of attributes that will be displayed on the model's show page.
-  SHOW_PAGE_ATTRIBUTES = %i[
+  enterprise_show_page_attributes = ChatwootApp.enterprise? ? %i[limits] : []
+  SHOW_PAGE_ATTRIBUTES = (%i[
     id
     name
     created_at
@@ -41,15 +44,16 @@ class AccountDashboard < Administrate::BaseDashboard
     locale
     conversations
     account_users
-  ].freeze
+  ] + enterprise_show_page_attributes).freeze
 
   # FORM_ATTRIBUTES
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
-  FORM_ATTRIBUTES = %i[
+  enterprise_form_attributes = ChatwootApp.enterprise? ? %i[limits] : []
+  FORM_ATTRIBUTES = (%i[
     name
     locale
-  ].freeze
+  ] + enterprise_form_attributes).freeze
 
   # COLLECTION_FILTERS
   # a hash that defines filters that can be used while searching via the search
@@ -69,4 +73,8 @@ class AccountDashboard < Administrate::BaseDashboard
   def display_resource(account)
     "##{account.id} #{account.name}"
   end
+
+  def permitted_attributes
+    super + [limits: {}]
+  end
 end
diff --git a/app/fields/enterprise/account_limits_field.rb b/app/fields/enterprise/account_limits_field.rb
new file mode 100644
index 000000000..5833952ad
--- /dev/null
+++ b/app/fields/enterprise/account_limits_field.rb
@@ -0,0 +1,7 @@
+require 'administrate/field/base'
+
+class Enterprise::AccountLimitsField < Administrate::Field::Base
+  def to_s
+    data.present? ? data.to_json : { agents: nil, inboxes: nil }.to_json
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index da0dd062b..ee595902a 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -77,6 +77,7 @@ class Account < ApplicationRecord
 
   enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
 
+  before_validation :validate_limit_keys
   after_create_commit :notify_creation
 
   def agents
@@ -114,8 +115,8 @@ class Account < ApplicationRecord
 
   def usage_limits
     {
-      agents: ChatwootApp.max_limit,
-      inboxes: ChatwootApp.max_limit
+      agents: ChatwootApp.max_limit.to_i,
+      inboxes: ChatwootApp.max_limit.to_i
     }
   end
 
@@ -132,4 +133,8 @@ class Account < ApplicationRecord
   trigger.name('camp_dpid_before_insert').after(:insert).for_each(:row) do
     "execute format('create sequence IF NOT EXISTS camp_dpid_seq_%s', NEW.id);"
   end
+
+  def validate_limit_keys
+    # method overridden in enterprise module
+  end
 end
diff --git a/app/views/fields/account_limits_field/_form.html.erb b/app/views/fields/account_limits_field/_form.html.erb
new file mode 100644
index 000000000..8c932a704
--- /dev/null
+++ b/app/views/fields/account_limits_field/_form.html.erb
@@ -0,0 +1,9 @@
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+
+  <% JSON.parse(field.to_s).each do |key,val| %>
+    <%= key %>: <%= number_field "account[limits]", key, value: val %> </br>
+  <% end %>
+</div>
diff --git a/app/views/fields/account_limits_field/_index.html.erb b/app/views/fields/account_limits_field/_index.html.erb
new file mode 100644
index 000000000..6d9dbc907
--- /dev/null
+++ b/app/views/fields/account_limits_field/_index.html.erb
@@ -0,0 +1 @@
+<%= field.to_s %>
diff --git a/app/views/fields/account_limits_field/_show.html.erb b/app/views/fields/account_limits_field/_show.html.erb
new file mode 100644
index 000000000..d464212d6
--- /dev/null
+++ b/app/views/fields/account_limits_field/_show.html.erb
@@ -0,0 +1,3 @@
+<% JSON.parse(field.to_s).each do |k,v| %>
+<%= k %>: <%= v %> </br>
+<% end %>
diff --git a/enterprise/app/models/enterprise/account.rb b/enterprise/app/models/enterprise/account.rb
index 84d72e0b3..99defb6ea 100644
--- a/enterprise/app/models/enterprise/account.rb
+++ b/enterprise/app/models/enterprise/account.rb
@@ -1,8 +1,8 @@
 module Enterprise::Account
   def usage_limits
     {
-      agents: get_limits(:agents),
-      inboxes: get_limits(:inboxes)
+      agents: get_limits(:agents).to_i,
+      inboxes: get_limits(:inboxes).to_i
     }
   end
 
@@ -12,4 +12,21 @@ module Enterprise::Account
     config_name = "ACCOUNT_#{limit_name.to_s.upcase}_LIMIT"
     self[:limits][limit_name.to_s] || GlobalConfig.get(config_name)[config_name] || ChatwootApp.max_limit
   end
+
+  def validate_limit_keys
+    errors.add(:limits, ': Invalid data') unless self[:limits].is_a? Hash
+    self[:limits] = {} if self[:limits].blank?
+
+    limit_schema = {
+      'type' => 'object',
+      'properties' => {
+        'inboxes' => { 'type': 'number' },
+        'agents' => { 'type': 'number' }
+      },
+      'required' => [],
+      'additionalProperties' => false
+    }
+
+    errors.add(:limits, ': Invalid data') unless JSONSchemer.schema(limit_schema).valid?(self[:limits])
+  end
 end

From 04148b95a6a815210e78758f742154fac0e201af Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@chatwoot.com>
Date: Mon, 14 Feb 2022 17:11:43 +0530
Subject: [PATCH 086/101] chore: Update translations (#3937)

---
 .../i18n/locale/ar/conversation.json          |   1 +
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |   6 +-
 .../i18n/locale/bg/conversation.json          |   1 +
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |   6 +-
 .../i18n/locale/ca/conversation.json          |   1 +
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |   6 +-
 .../i18n/locale/cs/conversation.json          |   1 +
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |   6 +-
 .../i18n/locale/da/conversation.json          |   1 +
 .../dashboard/i18n/locale/da/inboxMgmt.json   |   6 +-
 .../i18n/locale/de/conversation.json          |   1 +
 .../dashboard/i18n/locale/de/inboxMgmt.json   |   6 +-
 .../i18n/locale/el/conversation.json          |   1 +
 .../dashboard/i18n/locale/el/inboxMgmt.json   |   6 +-
 .../i18n/locale/es/conversation.json          |   1 +
 .../dashboard/i18n/locale/es/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/fa/automation.json  |   6 +-
 .../i18n/locale/fa/conversation.json          |   3 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  24 +-
 .../i18n/locale/fi/conversation.json          |   1 +
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |   6 +-
 .../i18n/locale/fr/conversation.json          |   1 +
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/he/cannedMgmt.json  |   2 +-
 .../dashboard/i18n/locale/he/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/he/contact.json     |  16 +-
 .../i18n/locale/he/conversation.json          |  75 ++---
 .../i18n/locale/he/generalSettings.json       |   2 +-
 .../dashboard/i18n/locale/he/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/he/settings.json    |   2 +-
 .../i18n/locale/hi/conversation.json          |   1 +
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |   6 +-
 .../i18n/locale/hu/conversation.json          |   1 +
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |   6 +-
 .../i18n/locale/id/conversation.json          |   1 +
 .../dashboard/i18n/locale/id/inboxMgmt.json   |   6 +-
 .../i18n/locale/it/conversation.json          |   1 +
 .../dashboard/i18n/locale/it/inboxMgmt.json   |   6 +-
 .../i18n/locale/ja/conversation.json          |   1 +
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |   6 +-
 .../i18n/locale/ko/conversation.json          |   1 +
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |   6 +-
 .../i18n/locale/lv/conversation.json          |   1 +
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |   6 +-
 .../i18n/locale/ml/conversation.json          |   1 +
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |   6 +-
 .../i18n/locale/ne/conversation.json          |   1 +
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |   6 +-
 .../i18n/locale/nl/conversation.json          |   1 +
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |   6 +-
 .../i18n/locale/no/conversation.json          |   1 +
 .../dashboard/i18n/locale/no/inboxMgmt.json   |   6 +-
 .../i18n/locale/pl/advancedFilters.json       |  22 +-
 .../i18n/locale/pl/attributesMgmt.json        |  14 +-
 .../dashboard/i18n/locale/pl/automation.json  |  10 +-
 .../dashboard/i18n/locale/pl/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/pl/contact.json     |  64 ++--
 .../i18n/locale/pl/contactFilters.json        |   6 +-
 .../i18n/locale/pl/conversation.json          |  41 +--
 .../i18n/locale/pl/generalSettings.json       |   8 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   | 108 +++----
 .../dashboard/i18n/locale/pl/labelsMgmt.json  |   8 +-
 .../dashboard/i18n/locale/pl/report.json      |  36 +--
 .../dashboard/i18n/locale/pl/settings.json    |  60 ++--
 .../i18n/locale/pl/teamsSettings.json         |  10 +-
 .../i18n/locale/pt/advancedFilters.json       |  94 +++---
 .../dashboard/i18n/locale/pt/contact.json     |   4 +-
 .../i18n/locale/pt/contactFilters.json        |  42 +--
 .../i18n/locale/pt/conversation.json          |   1 +
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |   6 +-
 .../i18n/locale/pt_BR/conversation.json       |   1 +
 .../i18n/locale/pt_BR/inboxMgmt.json          |   6 +-
 .../i18n/locale/ro/conversation.json          |   1 +
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |   6 +-
 .../i18n/locale/ru/conversation.json          |   1 +
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |   6 +-
 .../i18n/locale/sk/conversation.json          |   1 +
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |   6 +-
 .../i18n/locale/sv/conversation.json          |   1 +
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |   6 +-
 .../i18n/locale/ta/conversation.json          |   1 +
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |   6 +-
 .../i18n/locale/th/conversation.json          |   1 +
 .../dashboard/i18n/locale/th/inboxMgmt.json   |   6 +-
 .../i18n/locale/tr/conversation.json          |   1 +
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |   6 +-
 .../i18n/locale/uk/conversation.json          |   1 +
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |   6 +-
 .../i18n/locale/vi/advancedFilters.json       |  92 +++---
 .../dashboard/i18n/locale/vi/agentMgmt.json   |   2 +-
 .../i18n/locale/vi/attributesMgmt.json        |  80 ++---
 .../dashboard/i18n/locale/vi/automation.json  |  64 ++--
 .../dashboard/i18n/locale/vi/campaign.json    | 110 +++----
 .../dashboard/i18n/locale/vi/cannedMgmt.json  |  12 +-
 .../dashboard/i18n/locale/vi/chatlist.json    |  12 +-
 .../dashboard/i18n/locale/vi/contact.json     | 242 +++++++--------
 .../i18n/locale/vi/contactFilters.json        |  54 ++--
 .../i18n/locale/vi/conversation.json          | 163 +++++-----
 .../dashboard/i18n/locale/vi/csatMgmt.json    |   4 +-
 .../i18n/locale/vi/generalSettings.json       | 110 +++----
 .../dashboard/i18n/locale/vi/inboxMgmt.json   | 278 +++++++++---------
 .../i18n/locale/vi/integrationApps.json       |  34 +--
 .../i18n/locale/vi/integrations.json          |  10 +-
 .../dashboard/i18n/locale/vi/labelsMgmt.json  |   6 +-
 .../dashboard/i18n/locale/vi/report.json      | 112 +++----
 .../dashboard/i18n/locale/vi/settings.json    | 120 ++++----
 .../dashboard/i18n/locale/vi/signup.json      |  18 +-
 .../i18n/locale/vi/teamsSettings.json         | 100 +++----
 .../i18n/locale/zh_CN/conversation.json       |   1 +
 .../i18n/locale/zh_CN/inboxMgmt.json          |   6 +-
 .../i18n/locale/zh_TW/conversation.json       |   1 +
 .../i18n/locale/zh_TW/inboxMgmt.json          |   6 +-
 app/javascript/widget/i18n/locale/pl.json     |  18 +-
 app/javascript/widget/i18n/locale/pt.json     |   8 +-
 app/javascript/widget/i18n/locale/vi.json     |  38 +--
 config/locales/pl.yml                         |  22 +-
 config/locales/vi.yml                         |  70 ++---
 117 files changed, 1432 insertions(+), 1247 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index cf2da6208..ca6a5eefc 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "إلى",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index dca27df68..64a443b2b 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "الدومين",
         "PLACE_HOLDER": "الدومين"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index fb6d9082a..db9a16f1d 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "До",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index b39e26754..c83341829 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 49332faec..05750ad91 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index db30ea0ba..cda917c5b 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index f96181c05..c4e6be04d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Komu",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 86f039f7a..a848d6410 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index c34fa45dd..0e318f224 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 361cb9a9f..8c2eff333 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 933912cd4..0dfef63e8 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "An",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index fa24cb9d8..cde61d8a5 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Verschlüsselung",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "SSL-Überprüfungsmodus öffnen"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index 3531f4810..1597de4a2 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Προς",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 1040d94df..8dcafd148 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Κρυπτογράφηση",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Λειτουργία Επιβεβαίωσης SSL"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index aeeb3c837..00e09ace0 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Para",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 3f04a47be..dec6abcc3 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Dominio",
         "PLACE_HOLDER": "Dominio"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/automation.json b/app/javascript/dashboard/i18n/locale/fa/automation.json
index 8cd6e04d5..be2b80e1a 100644
--- a/app/javascript/dashboard/i18n/locale/fa/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/automation.json
@@ -72,10 +72,10 @@
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "کلون",
       "API": {
-        "SUCCESS_MESSAGE": "Automation cloned successfully",
-        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "اتوماسیون با موفقیت کلون شد",
+        "ERROR_MESSAGE": "نمی‌توان قانون اتوماسیون را کلون کرد، لطفاً بعداً دوباره امتحان کنید"
       }
     },
     "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index d29ba0388..de2fe16b7 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -22,7 +22,7 @@
     "LOADING_CONVERSATIONS": "در حال بارگیری گفتگو‌ها",
     "CANNOT_REPLY": "شما نمی‌توانید پاسخ بدهید به دلیل",
     "24_HOURS_WINDOW": "محدودیت ۲۴ ساعته پنجره پیام",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "این گفتگو به شما اختصاص داده نشده است. آیا می خواهید این گفتگو را به خودتان اختصاص دهید؟",
     "ASSIGN_TO_ME": "اختصاص به من",
     "TWILIO_WHATSAPP_CAN_REPLY": "شما فقط می توانید با استفاده از یک پیام الگو به این مکالمه پاسخ دهید",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "محدودیت ۲۴ ساعته پنجره پیام",
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "از",
     "TO": "به",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 5f4d9fd5d..bdb27b272 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -149,22 +149,22 @@
         "BANDWIDTH": {
           "ACCOUNT_ID": {
             "LABEL": "شناسه حساب‌کاربری",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "PLACEHOLDER": "لطفا شناسه حساب Bandwidth خود را وارد کنید",
             "ERROR": "پر کردن این فیلد ضروری است"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "API key",
+            "PLACEHOLDER": "لطفاً کلید Bandwith API خود را وارد کنید",
             "ERROR": "پر کردن این فیلد ضروری است"
           },
           "API_SECRET": {
             "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "PLACEHOLDER": "لطفا Bandwith API Secret خود را وارد کنید",
             "ERROR": "پر کردن این فیلد ضروری است"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "LABEL": "شناسه برنامه",
+            "PLACEHOLDER": "لطفا شناسه برنامه Bandwidth خود را وارد کنید",
             "ERROR": "پر کردن این فیلد ضروری است"
           },
           "INBOX_NAME": {
@@ -177,13 +177,13 @@
             "PLACEHOLDER": "لطفا شماره‌ای که پیام‌ می‌بایست به آن ارسال شود را وارد کنید",
             "ERROR": "لطفا شماره تلفن را به شکل صحیح وارد کنید. شماره می‌بایست با کاراکتر `+` شروع شود"
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "ایجاد کانال Bandwidth",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "ما نتوانستیم اعتبارنامه Bandwidth را احراز هویت کنیم، لطفاً دوباره امتحان کنید"
           },
           "API_CALLBACK": {
             "TITLE": "آدرس URL مربوط به API",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "SUBTITLE": "شما باید URL بازگشت به تماس پیام را در Bandwidth با URL ذکر شده در اینجا پیکربندی کنید."
           }
         }
       },
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "دامنه",
         "PLACE_HOLDER": "دامنه"
-      }
+      },
+      "ENCRYPTION": "رمزگذاری",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "باز کردن حالت تایید SSL"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index f14439b5c..8a9e5898c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 13ed74d16..acb2e5e8c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index a057c7622..344898ea4 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "À",
     "BCC": "Cci",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index ebf71c3d0..74549aee1 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domaine",
         "PLACE_HOLDER": "Domaine"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
index ce349ac97..ede367a0e 100644
--- a/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
@@ -22,7 +22,7 @@
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "קוד קצר",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "נא להזין קוד קצר",
           "ERROR": "קוד קצר נדרש"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/he/chatlist.json b/app/javascript/dashboard/i18n/locale/he/chatlist.json
index 1cd0ff3a5..7dedc1a56 100644
--- a/app/javascript/dashboard/i18n/locale/he/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/he/chatlist.json
@@ -7,7 +7,7 @@
       "404": "אין שיחות פעילות בקבוצה הזו."
     },
     "TAB_HEADING": "שיחות",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "אִזְכּוּרים",
     "SEARCH": {
       "INPUT": "חפש אנשים, צ'אטים, תגובות שמורות .."
     },
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index fb937508e..5a2137d6f 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -111,7 +111,7 @@
         "LABEL": "מספר טלפון",
         "HELP": "מספר הטלפון צריך להיות בפורמט E.164, למשל: +1415555555 [+][קוד מדינה][אזור חיוג][מספר טלפון מקומי]",
         "ERROR": "מספר הטלפון צריך להיות ריק או בפורמט E.164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "מספר טלפון זה נמצאת בשימוש עבור איש קשר אחר."
       },
       "LOCATION": {
         "PLACEHOLDER": "הזן את המיקום של איש הקשר",
@@ -178,9 +178,9 @@
     "FIELDS": "שדות איש קשר",
     "SEARCH_BUTTON": "חפש",
     "SEARCH_INPUT_PLACEHOLDER": "חפש איש קשר",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS": "סנן",
+    "FILTER_CONTACTS_SAVE": "שמור סנן",
+    "FILTER_CONTACTS_DELETE": "מחק סנן",
     "LIST": {
       "LOADING_MESSAGE": "טוען אנשי קשר...",
       "404": "אין אנשי קשר שתואמים לחיפוש שלך 🔍",
@@ -268,7 +268,7 @@
         "PLACEHOLDER": "למשל: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
+        "TITLE": "צור מאפיין חדש ",
         "SUCCESS": "מאפיין נוסף בהצלחה",
         "ERROR": "לא ניתן היה ליצור מאפיין, אנא נסה שוב מאוחר יותר"
       },
@@ -287,9 +287,9 @@
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "בחר ערך",
+          "SEARCH_INPUT_PLACEHOLDER": "חפש ערך",
+          "NO_RESULT": "לא נמצאו תוצאות"
         }
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 8676d1e59..2dc4cd4b2 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "אנא בחר שיחה מהחלונית השמאלית",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "UNVERIFIED_SESSION": "זהות המשתמש לא מְאוּמָתת",
     "NO_MESSAGE_1": "או - או! נראה שאין הודעות מלקוחות בתיבת הדואר הנכנס שלך.",
     "NO_MESSAGE_2": " לשלוח הודעה לעמוד שלך!",
     "NO_INBOX_1": "שלום! נראה שעדיין לא הוספת תיבות דואר נכנס.",
@@ -22,8 +22,8 @@
     "LOADING_CONVERSATIONS": "טוען שיחות",
     "CANNOT_REPLY": "לא ניתן להשיב עקב",
     "24_HOURS_WINDOW": "הגבלת חלון הודעות של 24 שעות",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
+    "NOT_ASSIGNED_TO_YOU": "השיחה לא שייכת לך, האם תרצה לשייך אותה אליך?",
+    "ASSIGN_TO_ME": "שייך לעצמך",
     "TWILIO_WHATSAPP_CAN_REPLY": "אתה יכול להשיב לשיחה זו רק באמצעות הודעת תבנית בשל",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "הגבלת חלון הודעות של 24 שעות",
     "SELECT_A_TWEET_TO_REPLY": "אנא בחר ציוץ להשיב.",
@@ -67,71 +67,71 @@
       "CREATE": "הוסף הערה",
       "TWEET": "ציוץ",
       "TIP_FORMAT_ICON": "הצג עורך טקסט עשיר",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
-      "ENTER_TO_SEND": "Enter to send",
-      "DRAG_DROP": "Drag and drop here to attach",
+      "TIP_EMOJI_ICON": "הצג בחירת אימוג'ים",
+      "TIP_ATTACH_ICON": "הוסף קבצים",
+      "ENTER_TO_SEND": "אנטר לשליחה",
+      "DRAG_DROP": "גרור ושחרר כאן להוספת קובץ מצורף",
       "EMAIL_HEAD": {
-        "ADD_BCC": "Add bcc",
+        "ADD_BCC": "הוסף bcc",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "אימיילים מופרדים בפסיקים",
+          "ERROR": "בבקשה הכנס כתוכת אימייל"
         },
         "BCC": {
-          "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "LABEL": "BBC",
+          "PLACEHOLDER": "אימיילים מופרדים בפסיקים",
+          "ERROR": "בבקשה הכנס כתוכת אימייל"
         }
       }
     },
-    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
-    "CHANGE_STATUS": "Conversation status changed",
-    "CHANGE_AGENT": "Conversation Assignee changed",
-    "CHANGE_TEAM": "Conversation team changed",
+    "VISIBLE_TO_AGENTS": "פתקים פרטיים: רק אתה והצוות שלך יכולים לראות",
+    "CHANGE_STATUS": "סטטוס השיחה השתנה",
+    "CHANGE_AGENT": "שיוך שיחה השתנתה",
+    "CHANGE_TEAM": "שיחת קבוצה השתנתה",
     "FILE_SIZE_LIMIT": "קובץ חורג ממגבלת גודל מקסימלי {MAXIMUM_FILE_UPLOAD_SIZE}",
-    "MESSAGE_ERROR": "Unable to send this message, please try again later",
+    "MESSAGE_ERROR": "לא ניתן לשלוח הודעה, אנא נסה שוב מאוחר יותר",
     "SENT_BY": "נשלח על ידי:",
     "BOT": "בוט",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "לא ניתן לשלוח הודעה! נסה שוב",
+    "TRY_AGAIN": "נסה שוב",
     "ASSIGNMENT": {
       "SELECT_AGENT": "בחר סוכן",
-      "REMOVE": "Remove",
-      "ASSIGN": "Assign"
+      "REMOVE": "הסר",
+      "ASSIGN": "שייך"
     },
     "CONTEXT_MENU": {
-      "COPY": "Copy",
+      "COPY": "העתק",
       "DELETE": "מחק"
     }
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
-    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "TITLE": "שלח תמליל של השיחה",
+    "DESC": "שלח את תמליל השיחה למייל ספציפי",
     "SUBMIT": "שלח",
     "CANCEL": "ביטול",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_SUCCESS": "תמליל השיחה נשלח בהצלחה",
     "SEND_EMAIL_ERROR": "היתה שגיאה, בקשה נסה שוב",
     "FORM": {
-      "SEND_TO_CONTACT": "Send the transcript to the customer",
-      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_CONTACT": "שלח תמליל ללקוח",
+      "SEND_TO_AGENT": "שלח תמליל לסוכן המשוייך לשיחה",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "שלח תמליל לאימייל אחר",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
-        "ERROR": "Please enter a valid email address"
+        "PLACEHOLDER": "הכנס כתובת אימייל",
+        "ERROR": "בבקשה הכנס כתוכת אימייל תקינה"
       }
     }
   },
   "ONBOARDING": {
-    "TITLE": "Hey 👋, Welcome to %{installationName}!",
-    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
-    "READ_LATEST_UPDATES": "Read our latest updates",
+    "TITLE": "היי 👋, ברוך הבא ל%{installationName}!",
+    "DESCRIPTION": "תודה על ההרשמה. אנחנו רוצים לתת לך את הכי הרבה מ %{installationName}. הינה כמה דברים שאתה יכול לעשות עם %{installationName} לחוויה טובה.",
+    "READ_LATEST_UPDATES": "תקרא את העדכונים אחרונים",
     "ALL_CONVERSATION": {
-      "TITLE": "All your conversations in one place",
-      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+      "TITLE": "כל השיחות שלך במקום אחד",
+      "DESCRIPTION": "צפה בכל השיחות שלך עם הלקוחות בדאשבורד אחד. אתה יכול לסנן את השיחות לפי הערוץ, התווית והסטטוס."
     },
     "TEAM_MEMBERS": {
-      "TITLE": "Invite your team members",
+      "TITLE": "הזמן את חברי הצוות שלך",
       "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
       "NEW_LINK": "Click here to invite a team member"
     },
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "אל",
     "BCC": "Bcc",
     "CC": "עותק",
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index ba08ffb72..c9ca37434 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -117,7 +117,7 @@
       "ASSIGN_AN_AGENT": "Assign an agent",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
+      "UNMUTE_CONVERSATION": "בטל השתקת שיחה",
       "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
       "REOPEN_CONVERSATION": "פתח מחדש את השיחה",
       "RESOLVE_CONVERSATION": "פתור את השיחה",
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 19492c38d..7374c7151 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 3b5be6530..ec4b734bf 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -136,7 +136,7 @@
   "SIDEBAR": {
     "CONVERSATIONS": "שיחות",
     "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "אִזְכּוּרים",
     "REPORTS": "Reports",
     "SETTINGS": "הגדרות",
     "CONTACTS": "איש קשר",
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index c545502ec..77a273ead 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index a04e3d49b..18725cbf6 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 876ada502..575891ef4 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Ide",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index a8a76260d..be26bec2f 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 8f7ba5241..12ee9f0ab 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Ke",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index e95b2cec1..84de610bf 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index a03f5e548..1d8e6d340 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 782a664c2..06aba67dd 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Dominio",
         "PLACE_HOLDER": "Dominio"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 304664010..58c093c4c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 605512458..2a5f17ccb 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index 30f083897..f014a3cd6 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index 802cdacb1..4820f1d60 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index c545502ec..77a273ead 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index a04e3d49b..18725cbf6 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index b3021e1ce..c6bfca4b4 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 65b482b58..aa1537e23 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 1e0a72240..769d1530f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index a04e3d49b..18725cbf6 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index d58022b80..0ff7fda12 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 7a64e16c8..0f9d52fb8 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domeinnaam",
         "PLACE_HOLDER": "Domeinnaam"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 7c16e1bf6..8fef083f3 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 5cc3e12f3..91f53c92e 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
index e7d2e5cb6..7369a3518 100644
--- a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
@@ -25,7 +25,7 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Nazwa osoby przypisanej",
       "INBOX_NAME": "Nazwa skrzynki odbiorczej",
       "TEAM_NAME": "Team Name",
       "CONVERSATION_IDENTIFIER": "Conversation Identifier",
@@ -47,15 +47,15 @@
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
-        "ERROR_MESSAGE": "Name is required",
-        "SAVE_BUTTON": "Save filter",
+        "TITLE": "Czy chcesz zapisać ten filtr?",
+        "LABEL": "Nazwij filtr",
+        "PLACEHOLDER": "Wprowadź nazwę dla tego filtra",
+        "ERROR_MESSAGE": "Nazwa jest wymagana",
+        "SAVE_BUTTON": "Zapisz filtr",
         "CANCEL_BUTTON": "Anuluj",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "Folder utworzony pomyślnie",
+          "ERROR_MESSAGE": "Błąd podczas tworzenia folderu"
         },
         "API_SEGMENTS": {
           "SUCCESS_MESSAGE": "Segment created successfully",
@@ -63,13 +63,13 @@
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Usuń filtr",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Potwierdź usunięcie",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "Czy na pewno chcesz usunąć filtr ",
             "YES": "Tak, usuń",
-            "NO": "No, Keep it"
+            "NO": "Nie, zachowaj"
           }
         },
         "API_FOLDERS": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
index e5c55a561..447f6bc95 100644
--- a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
@@ -70,29 +70,29 @@
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
+        "SUCCESS_MESSAGE": "Atrybut zaktualizowany pomyślnie",
         "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
       }
     },
     "TABS": {
       "HEADER": "Niestandardowe atrybuty",
-      "CONVERSATION": "Conversation",
-      "CONTACT": "Contact"
+      "CONVERSATION": "Rozmowa",
+      "CONTACT": "Kontakt"
     },
     "LIST": {
       "TABLE_HEADER": [
         "Nazwa",
         "Opis",
-        "Type",
-        "Key"
+        "Typ",
+        "Klucz"
       ],
       "BUTTONS": {
         "EDIT": "Edytuj",
         "DELETE": "Usuń"
       },
       "EMPTY_RESULT": {
-        "404": "There are no custom attributes created",
-        "NOT_FOUND": "There are no custom attributes configured"
+        "404": "Nie utworzono atrybutów niestandardowych",
+        "NOT_FOUND": "Brak skonfigurowanych atrybutów niestandardowych"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pl/automation.json b/app/javascript/dashboard/i18n/locale/pl/automation.json
index 48fed5ea7..6f4704ecc 100644
--- a/app/javascript/dashboard/i18n/locale/pl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/automation.json
@@ -1,17 +1,17 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule",
+    "HEADER": "Automatyzacja",
+    "HEADER_BTN_TXT": "Dodaj regułę automatyzacji",
     "LOADING": "Fetching automation rules",
     "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
     "ADD": {
-      "TITLE": "Add Automation Rule",
+      "TITLE": "Dodaj regułę automatyzacji",
       "SUBMIT": "Stwórz",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
+          "LABEL": "Nazwa reguły",
+          "PLACEHOLDER": "Wprowadź nazwę reguły",
           "ERROR": "Name is required"
         },
         "DESC": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
index 7881ae8e8..2a3030606 100644
--- a/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Dodaj Gotową odpowiedź",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Gotowe odpowiedzi są zapisanymi szablonami odpowiedzi, które mogą być użyte do szybkiego wysyłania odpowiedzi do konwersacji.",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krótki kod",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "Wprowadź krótki kod",
           "ERROR": "Krótki kod jest wymagany"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 247ac28bd..e006c2d06 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -179,8 +179,8 @@
     "SEARCH_BUTTON": "Szukaj",
     "SEARCH_INPUT_PLACEHOLDER": "Szukaj kontaktów",
     "FILTER_CONTACTS": "Filtruj",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS_SAVE": "Zapisz filtr",
+    "FILTER_CONTACTS_DELETE": "Usuń filtr",
     "LIST": {
       "LOADING_MESSAGE": "Ładowanie kontaktów...",
       "404": "Brak kontaktów pasujących do Twojego wyszukiwania 🔍",
@@ -244,12 +244,12 @@
   "CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Dodaj atrybuty",
     "BUTTON": "Dodaj niestandardowy atrybut",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "NOT_AVAILABLE": "Brak niestandardowych atrybutów dostępnych dla tego kontaktu.",
     "COPY_SUCCESSFUL": "Pomyślnie skopiowano do schowka",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "Dodaj atrybut",
+      "DELETE": "Usuń atrybut",
+      "EDIT": "Dodaj atrybut"
     },
     "ADD": {
       "TITLE": "Dodaj niestandardowy atrybut",
@@ -268,64 +268,64 @@
         "PLACEHOLDER": "Np.: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "TITLE": "Dodaj niestandardowy atrybut ",
+        "SUCCESS": "Atrybut dodany pomyślnie",
+        "ERROR": "Nie można dodać atrybutu. Spróbuj ponownie później"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "Atrybut zaktualizowany pomyślnie",
+        "ERROR": "Nie można dodać atrybutu. Spróbuj ponownie później"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Atrybut usunięty pomyślnie",
+        "ERROR": "Nie można usunąć atrybutu. Spróbuj ponownie później"
       },
       "ATTRIBUTE_SELECT": {
         "TITLE": "Dodaj atrybuty",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "PLACEHOLDER": "Szukaj atrybutów",
+        "NO_RESULT": "Nie znaleziono atrybutów"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Wybierz wartość",
+          "SEARCH_INPUT_PLACEHOLDER": "Wyszukaj wartość",
+          "NO_RESULT": "Brak wyników"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Wymagana jest prawidłowa wartość",
+      "INVALID_URL": "Nieprawidłowy adres URL"
     }
   },
   "MERGE_CONTACTS": {
     "TITLE": "Połącz kontakty",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "DESCRIPTION": "Połącz kontakty w celu połączenia dwóch profili w jeden, w tym wszystkich atrybutów i konwersacji. W przypadku konfliktu atrybuty głównego kontaktu będą miały pierwszeństwo.",
     "PRIMARY": {
-      "TITLE": "Primary contact",
-      "HELP_LABEL": "To be kept"
+      "TITLE": "Kontakt podstawowy",
+      "HELP_LABEL": "Do przechowywania"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "Kontakt do scalenia",
+      "PLACEHOLDER": "Szukaj kontaktów",
+      "HELP_LABEL": "Do usunięcia"
     },
     "SUMMARY": {
       "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+      "DELETE_WARNING": "Kontakt z <strong>%{childContactName}</strong> zostanie usunięty.",
+      "ATTRIBUTE_WARNING": "Dane kontaktowe <strong>%{childContactName}</strong> zostaną skopiowane do <strong>%{primaryContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR": "Błąd"
     },
     "FORM": {
       "SUBMIT": " Połącz kontakty",
       "CANCEL": "Anuluj",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "Wybierz kontakt podrzędny do scalenia"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "SUCCESS_MESSAGE": "Kontakt pomyślnie scalony",
+      "ERROR_MESSAGE": "Nie można scalić kontaktów, spróbuj ponownie!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
index f59f7a245..2e92645e1 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
@@ -1,9 +1,9 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
+        "TITLE": "Filtruj kontakty",
         "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
+        "ADD_NEW_FILTER": "Dodaj filtr",
+        "CLEAR_ALL_FILTERS": "Wyczyść wszystkie filtry",
         "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
         "SUBMIT_BUTTON_LABEL": "Prześlij",
         "CANCEL_BUTTON_LABEL": "Anuluj",
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index a5dbacd31..6b7550f73 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Wybierz rozmowę z lewej strony",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "UNVERIFIED_SESSION": "Tożsamość tego użytkownika nie jest zweryfikowana",
     "NO_MESSAGE_1": "Ups! Wygląda na to, że nie ma wiadomości od klientów w Twojej skrzynce odbiorczej.",
     "NO_MESSAGE_2": " aby wysłać wiadomość na swoją stronę!",
     "NO_INBOX_1": "Hola! Wygląda na to, że nie dodałeś jeszcze żadnej skrzynki odbiorczej.",
@@ -22,8 +22,8 @@
     "LOADING_CONVERSATIONS": "Ładowanie konwersacji",
     "CANNOT_REPLY": "Nie możesz odpowiedzieć z powodu",
     "24_HOURS_WINDOW": "Ograniczenie 24-godzinnego okna wiadomości",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
+    "NOT_ASSIGNED_TO_YOU": "Ta konwersacja nie jest Ci przypisana. Czy chcesz przypisać tę konwersację do siebie?",
+    "ASSIGN_TO_ME": "Przypisz do mnie",
     "TWILIO_WHATSAPP_CAN_REPLY": "Możesz odpowiedzieć na tę rozmowę tylko za pomocą szablonu wiadomości, ponieważ",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Ograniczenie 24-godzinnego okna wiadomości",
     "SELECT_A_TWEET_TO_REPLY": "Wybierz tweeta, na który chcesz odpowiedzieć.",
@@ -34,8 +34,8 @@
     "SUCCESS_DELETE_MESSAGE": "Wiadomość usunięta pomyślnie",
     "FAIL_DELETE_MESSSAGE": "Nie można usunąć wiadomości! Spróbuj ponownie",
     "NO_RESPONSE": "Brak odpowiedzi",
-    "RATING_TITLE": "Rating",
-    "FEEDBACK_TITLE": "Feedback",
+    "RATING_TITLE": "Ocena",
+    "FEEDBACK_TITLE": "Opinia",
     "HEADER": {
       "RESOLVE_ACTION": "Rozwiąż",
       "REOPEN_ACTION": "Otwórz ponownie",
@@ -43,9 +43,9 @@
       "OPEN": "Więcej",
       "CLOSE": "Zamknij",
       "DETAILS": "szczegóły",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_TOMORROW": "Drzemka do jutra",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Drzemka do następnego tygodnia",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Drzemka do następnej odpowiedzi"
     },
     "RESOLVE_DROPDOWN": {
       "MARK_PENDING": "Oznacz jako oczekujące",
@@ -70,18 +70,18 @@
       "TIP_EMOJI_ICON": "Pokaż selektor emotikonek",
       "TIP_ATTACH_ICON": "Dołącz pliki",
       "ENTER_TO_SEND": "Naciśnij \"enter\" aby wysłać",
-      "DRAG_DROP": "Drag and drop here to attach",
+      "DRAG_DROP": "Przeciągnij i upuść tutaj, aby dołączyć",
       "EMAIL_HEAD": {
-        "ADD_BCC": "Add bcc",
+        "ADD_BCC": "Dodaj bcc",
         "CC": {
           "LABEL": "CC",
           "PLACEHOLDER": "E-maile oddzielone przecinkami",
-          "ERROR": "Please enter valid email addresses"
+          "ERROR": "Wprowadź poprawny adres e-mail"
         },
         "BCC": {
           "LABEL": "BCC",
           "PLACEHOLDER": "E-maile oddzielone przecinkami",
-          "ERROR": "Please enter valid email addresses"
+          "ERROR": "Wprowadź poprawny adres e-mail"
         }
       }
     },
@@ -165,25 +165,26 @@
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Atrybut zaktualizowany pomyślnie",
+      "ERROR": "Nie można dodać atrybutu. Spróbuj ponownie później"
     },
     "ADD": {
       "TITLE": "Dodaj",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "SUCCESS": "Atrybut dodany pomyślnie",
+      "ERROR": "Nie można dodać atrybutu. Spróbuj ponownie później"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Atrybut usunięty pomyślnie",
+      "ERROR": "Nie można usunąć atrybutu. Spróbuj ponownie później"
     },
     "ATTRIBUTE_SELECT": {
       "TITLE": "Dodaj atrybuty",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "PLACEHOLDER": "Szukaj atrybutów",
+      "NO_RESULT": "Nie znaleziono atrybutów"
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Do",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index b2b8de2de..3a43d3fec 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -89,7 +89,7 @@
     "SECTIONS": {
       "GENERAL": "General",
       "REPORTS": "Raporty",
-      "CONVERSATION": "Conversation",
+      "CONVERSATION": "Rozmowa",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
@@ -120,9 +120,9 @@
       "UNMUTE_CONVERSATION": "Unmute conversation",
       "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
       "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
+      "RESOLVE_CONVERSATION": "Rozwiąż rozmowę",
+      "SEND_TRANSCRIPT": "Wyślij transkrypt rozmowy",
+      "SNOOZE_CONVERSATION": "Wycisz rozmowę",
       "UNTIL_NEXT_REPLY": "Do następnej odpowiedzi",
       "UNTIL_NEXT_WEEK": "Do następnego tygodnia",
       "UNTIL_TOMORROW": "Do jutra"
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index a1eecbc3e..04404a489 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -30,11 +30,11 @@
     "ADD": {
       "CHANNEL_NAME": {
         "LABEL": "Nazwa skrzynki odbiorczej",
-        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+        "PLACEHOLDER": "Wprowadź nazwę skrzynki odbiorczej (np. Acme Inc)"
       },
       "WEBSITE_NAME": {
-        "LABEL": "Website Name",
-        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        "LABEL": "Nazwa strony",
+        "PLACEHOLDER": "Wprowadź nazwę swojej strony (np. Acme Inc)"
       },
       "FB": {
         "HELP": "PS: Logując się, uzyskujemy dostęp tylko do wiadomości Twojej strony. Chatwoot nigdy nie może uzyskać dostępu do prywatnych wiadomości.",
@@ -49,7 +49,7 @@
         "HELP": "Aby dodać swój profil na Twitterze jako kanał, musisz uwierzytelnić swój profil Twitter klikając na 'Zaloguj się przez Twittera' ",
         "ERROR_MESSAGE": "Wystąpił błąd podczas łączenia z Twitterem, spróbuj ponownie",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Utwórz rozmowy ze wspomnianych Tweetów"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -61,7 +61,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL webhooka",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Wprowadź swój adres URL Webhooka",
           "ERROR": "Wprowadź poprawny adres URL"
         },
         "CHANNEL_DOMAIN": {
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Włącz powitanie dla kanału",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "Wyślij wiadomość powitalną użytkownikowi, gdy rozpocznie rozmowę.",
           "ENABLED": "Włączone",
           "DISABLED": "Wyłączone"
         },
@@ -100,8 +100,8 @@
         "SUBMIT_BUTTON": "Utwórz skrzynkę odbiorczą"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Kanał Twilio SMS/WhatsApp",
+        "DESC": "Zintegruj Twilio i zacznij wspierać swoich klientów poprzez SMS lub WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "Karta SID konta",
           "PLACEHOLDER": "Wprowadź SID konta Twilio",
@@ -118,7 +118,7 @@
         },
         "CHANNEL_NAME": {
           "LABEL": "Nazwa skrzynki odbiorczej",
-          "PLACEHOLDER": "Please enter a inbox name",
+          "PLACEHOLDER": "Wprowadź nazwę skrzynki odbiorczej",
           "ERROR": "To pole jest wymagane"
         },
         "PHONE_NUMBER": {
@@ -128,7 +128,7 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+          "SUBTITLE": "Musisz skonfigurować zwrotny adres URL wiadomości w Twilio z adresem URL wymienionym tutaj."
         },
         "SUBMIT_BUTTON": "Utwórz kanał Twilio",
         "API": {
@@ -136,29 +136,29 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "Kanał SMS",
+        "DESC": "Zacznij wspierać swoich klientów przez SMS.",
         "PROVIDERS": {
           "LABEL": "API Provider",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Bandwidth"
+          "BANDWIDTH": "Przepustowość"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "Nie byliśmy w stanie zapisać kanału SMS"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "LABEL": "ID konta",
+            "PLACEHOLDER": "Wprowadź swój identyfikator konta przepustowości",
             "ERROR": "To pole jest wymagane"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "Klucz API",
+            "PLACEHOLDER": "Wprowadź swój identyfikator konta przepustowości",
             "ERROR": "To pole jest wymagane"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
+            "LABEL": "Klucz API",
             "PLACEHOLDER": "Please enter your Bandwith API Secret",
             "ERROR": "To pole jest wymagane"
           },
@@ -169,7 +169,7 @@
           },
           "INBOX_NAME": {
             "LABEL": "Nazwa skrzynki odbiorczej",
-            "PLACEHOLDER": "Please enter a inbox name",
+            "PLACEHOLDER": "Wprowadź nazwę skrzynki odbiorczej",
             "ERROR": "To pole jest wymagane"
           },
           "PHONE_NUMBER": {
@@ -237,7 +237,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Kanał e-mail",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Zintegruj skrzynkę pocztową.",
         "CHANNEL_NAME": {
           "LABEL": "Nazwa kanału",
           "PLACEHOLDER": "Wprowadź nazwę kanału",
@@ -403,20 +403,20 @@
       "INBOX_AGENTS_SUB_TEXT": "Dodaj lub usuń agentów z tej skrzynki odbiorczej",
       "UPDATE": "Aktualizuj",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Włącz lub wyłącz skrzynkę zbierania wiadomości e-mail w nowej konwersacji",
       "AUTO_ASSIGNMENT": "Włącz automatyczne przypisanie",
       "ENABLE_CSAT": "Włącz CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Włącz/Wyłącz ankietę CSAT(Customer satisfraction) po rozwiązaniu rozmowy",
       "ENABLE_CONTINUITY_VIA_EMAIL": "Włącz ciągłość rozmowy przez e-mail",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Rozmowy będą kontynuowane przez e-mail, jeśli adres e-mail kontaktu jest dostępny.",
       "INBOX_UPDATE_TITLE": "Ustawienia skrzynki odbiorczej",
       "INBOX_UPDATE_SUB_TEXT": "Zaktualizuj ustawienia skrzynki odbiorczej",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Włącz lub wyłącz automatyczne przypisywanie nowych rozmów do agentów dodanych do tej skrzynki odbiorczej.",
       "HMAC_VERIFICATION": "Weryfikacja tożsamości użytkownika",
-      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
+      "HMAC_DESCRIPTION": "Polecenie weryfikacji tożsamości użytkownika, SDK pozwala na przekazanie pliku `identifier_hash` dla każdego użytkownika. Możesz wygenerować HMAC używając 'sha256' z kluczem pokazanym tutaj.",
+      "HMAC_MANDATORY_VERIFICATION": "Wymuś sprawdzanie tożsamości użytkownika",
+      "HMAC_MANDATORY_DESCRIPTION": "Jeśli włączone, chatwoot SDKs setUser nie będzie działać, chyba że `identifier_hash` jest dostarczony dla każdego użytkownika.",
+      "INBOX_IDENTIFIER": "Identyfikator skrzynki odbiorczej",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Przekaż do wiadomości e-mail",
       "FORWARD_EMAIL_SUB_TEXT": "Zacznij przekierowywać swoje wiadomości na następujący adres e-mail.",
@@ -426,36 +426,36 @@
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Ponowna autoryzacja",
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
-      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_SUCCESS": "Ponowne połączenie powiodło się",
       "MESSAGE_ERROR": "Wystąpił błąd, spróbuj ponownie"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "DESCRIPTION": "Formularze czatu umożliwiają przechwytywanie informacji o użytkowniku przed rozpoczęciem rozmowy z Tobą.",
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "Włącz formularz przed czatem",
         "OPTIONS": {
           "ENABLED": "Tak",
           "DISABLED": "Nie"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "Wiadomość na czacie",
+        "PLACEHOLDER": "Ta wiadomość będzie widoczna dla użytkowników wraz z formularzem"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "Odwiedzający powinni podać swoje imię i nazwisko oraz adres e-mail przed rozpoczęciem czatu"
       }
     },
     "BUSINESS_HOURS": {
       "TITLE": "Ustaw swoją dostępność",
-      "SUBTITLE": "Set your availability on your livechat widget",
+      "SUBTITLE": "Ustaw swoją dostępność na widżecie na czacie",
       "WEEKLY_TITLE": "Ustaw swoje godziny tygodniowe",
       "TIMEZONE_LABEL": "Wybierz strefę czasową",
       "UPDATE": "Zaktualizuj ustawienia godzin pracy",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
+      "TOGGLE_AVAILABILITY": "Włącz dostępność biznesową dla tej skrzynki odbiorczej",
+      "UNAVAILABLE_MESSAGE_LABEL": "Wiadomość niedostępna dla odwiedzających",
       "UNAVAILABLE_MESSAGE_DEFAULT": "W tej chwili jesteśmy niedostępni. Pozostaw wiadomość, a odpowiemy, gdy będzie to możliwe.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Włączenie dostępności biznesowej pokaże dostępne godziny na czacie na żywo, nawet jeśli wszyscy agenci są offline. Poza dostępnymi godzinami można ostrzec za pomocą wiadomości i formularza wstępnego czatu.",
       "DAY": {
         "ENABLE": "Włącz dostępność w tym dniu",
         "UNAVAILABLE": "Niedostępny",
@@ -466,17 +466,17 @@
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Ustaw szczegóły IMAP",
+      "UPDATE": "Aktualizuj ustawienia IMAP",
+      "TOGGLE_AVAILABILITY": "Włącz konfigurację IMAP dla tej skrzynki odbiorczej",
+      "TOGGLE_HELP": "Włączenie IMAP pomoże użytkownikowi otrzymywać e-mail",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "Ustawienia IMAP zostały zaktualizowane",
+        "ERROR_MESSAGE": "Nie można zaktualizować ustawień IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Adres IP",
+        "PLACE_HOLDER": "Adres (Eg: imap.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
@@ -490,20 +490,20 @@
         "LABEL": "Hasło",
         "PLACE_HOLDER": "Hasło"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Włącz SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Ustaw szczegóły SMTP",
+      "UPDATE": "Aktualizuj ustawienia SMTP",
+      "TOGGLE_AVAILABILITY": "Włącz konfigurację SMTP dla tej skrzynki odbiorczej",
+      "TOGGLE_HELP": "Włączenie SMTP pomoże użytkownikowi wysyłać wiadomości e-mail",
       "EDIT": {
         "SUCCESS_MESSAGE": "SMTP settings updated successfully",
         "ERROR_MESSAGE": "Unable to update SMTP settings"
       },
       "ADDRESS": {
-        "LABEL": "Address",
+        "LABEL": "Adres IP",
         "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
       },
       "PORT": {
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Otwórz tryb weryfikacji SSL"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
index 47ac417f4..25e60cb53 100644
--- a/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
@@ -6,7 +6,7 @@
     "SEARCH_404": "Brak elementów pasujących do tego zapytania",
     "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
     "LIST": {
-      "404": "There are no labels available in this account.",
+      "404": "Na tym koncie nie ma żadnych etykiet.",
       "TITLE": "Zarządzaj etykietami",
       "DESC": "Etykiety pozwalają na grupowanie rozmów razem.",
       "TABLE_HEADER": [
@@ -18,14 +18,14 @@
     "FORM": {
       "NAME": {
         "LABEL": "Nazwa etykiety",
-        "PLACEHOLDER": "Label name",
-        "REQUIRED_ERROR": "Label name is required",
+        "PLACEHOLDER": "Nazwa etykiety",
+        "REQUIRED_ERROR": "Nazwa etykiety jest wymagana",
         "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
         "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Opis",
-        "PLACEHOLDER": "Label Description"
+        "PLACEHOLDER": "Opis etykiety"
       },
       "COLOR": {
         "LABEL": "Kolor"
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index 6af27e9d2..41bfa58e6 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -234,28 +234,28 @@
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Ostatnie 6 miesięcy"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Ostatni rok"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Własny zakres dat"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Zastosuj",
+      "PLACEHOLDER": "Wybierz zakres dat"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
+    "HEADER": "Przegląd zespołu",
     "LOADING_CHART": "Ładowanie danych wykresów...",
     "NO_ENOUGH_DATA": "Nie otrzymaliśmy wystarczającej ilości punktów danych, aby wygenerować raport, spróbuj ponownie później.",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "DOWNLOAD_TEAM_REPORTS": "Pobierz raporty zespołu",
+    "FILTER_DROPDOWN_LABEL": "Wybierz zespół",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Rozmowy",
@@ -293,33 +293,33 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Ostatnie 3 miesięcy"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Ostatnie 6 miesięcy"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Ostatni rok"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Własny zakres dat"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Zastosuj",
+      "PLACEHOLDER": "Wybierz zakres dat"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "HEADER": "Raporty CSAT",
+    "NO_RECORDS": "Brak dostępnych odpowiedzi na ankietę CSAT.",
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
+        "CONTACT_NAME": "Kontakt",
+        "AGENT_NAME": "Przypisany Agent",
         "RATING": "Ocena",
         "FEEDBACK_TEXT": "Komentarz do opinii"
       }
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index e517032f3..ece7269ed 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -3,11 +3,11 @@
     "LINK": "Ustawienia profilu",
     "TITLE": "Ustawienia profilu",
     "BTN_TEXT": "Aktualizuj profil",
-    "DELETE_AVATAR": "Delete Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
-    "UPDATE_SUCCESS": "Your profile has been updated successfully",
-    "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
+    "DELETE_AVATAR": "Usuń awatar",
+    "AVATAR_DELETE_SUCCESS": "Awatar został usunięty",
+    "AVATAR_DELETE_FAILED": "Wystąpił błąd podczas usuwania awatara, spróbuj ponownie",
+    "UPDATE_SUCCESS": "Twój profil został pomyślnie zaktualizowany",
+    "PASSWORD_UPDATE_SUCCESS": "Twoje hasło zostało zmienione",
     "AFTER_EMAIL_CHANGED": "Twój profil został pomyślnie zaktualizowany, zaloguj się ponownie po zmianie danych logowania",
     "FORM": {
       "AVATAR": "Zdjęcie profilowe",
@@ -22,7 +22,7 @@
       "PASSWORD_SECTION": {
         "TITLE": "Hasło",
         "NOTE": "Aktualizacja hasła spowoduje zresetowanie logowania na wielu urządzeniach.",
-        "BTN_TEXT": "Change password"
+        "BTN_TEXT": "Zmień hasło"
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token dostępu",
@@ -32,8 +32,8 @@
         "TITLE": "Powiadomienia dźwiękowe",
         "NOTE": "Włącz powiadomienia audio na pulpicie dla nowych wiadomości i konwersacji.",
         "NONE": "Brak",
-        "ASSIGNED": "Assigned Conversations",
-        "ALL_CONVERSATIONS": "All Conversations"
+        "ASSIGNED": "Przypisane rozmowy",
+        "ALL_CONVERSATIONS": "Rozmowy"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Powiadomienia e-mail",
@@ -48,30 +48,30 @@
         "UPDATE_ERROR": "Wystąpił błąd podczas aktualizacji preferencji, spróbuj ponownie"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Push Notifications",
-        "NOTE": "Update your push notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "TITLE": "Powiadomienia dźwiękowe",
+        "NOTE": "Zaktualizuj ustawienia powiadomień tutaj",
+        "CONVERSATION_ASSIGNMENT": "Wyślij powiadomienia push, gdy konwersacja jest przypisana do mnie",
+        "CONVERSATION_CREATION": "Wysyłaj powiadomienia push po utworzeniu nowej rozmowy",
+        "CONVERSATION_MENTION": "Wyślij powiadomienia, gdy jesteś wymieniony w konwersacji",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia push, gdy nowa wiadomość zostanie utworzona w przypisanej konwersacji",
+        "HAS_ENABLED_PUSH": "Włączyłeś opcję push dla tej przeglądarki.",
+        "REQUEST_PUSH": "Włącz powiadomienia push"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Zdjęcie profilowe"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
+        "LABEL": "Twoje imię i nazwisko",
+        "ERROR": "Podaj swoje imię i nazwisko",
         "PLACEHOLDER": "Podaj swoje imię i nazwisko"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
-        "ERROR": "Please enter a valid display name",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "LABEL": "Wyświetlana nazwa",
+        "ERROR": "Wprowadź prawidłową nazwę wyświetlaną",
+        "PLACEHOLDER": "Wprowadź nazwę wyświetlaną, która będzie wyświetlana w rozmowach"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "Dostępność",
         "STATUSES_LIST": [
           "Online",
           "Zajęty",
@@ -84,25 +84,25 @@
         "PLACEHOLDER": "Wprowadź swój adres e-mail, który będzie wyświetlany w rozmowach"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
-        "ERROR": "Please enter the current password",
-        "PLACEHOLDER": "Please enter the current password"
+        "LABEL": "Aktualne hasło",
+        "ERROR": "Wprowadź aktualne hasło",
+        "PLACEHOLDER": "Wprowadź aktualne hasło"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "Nowe hasło",
         "ERROR": "Wprowadź hasło o długości 6 lub więcej",
         "PLACEHOLDER": "Wprowadź nowe hasło"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Potwierdź nowe hasło",
         "ERROR": "Potwierdź hasło powinno być zgodne z hasłem",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "PLACEHOLDER": "Wprowadź ponownie swoje nowe hasło"
       }
     }
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Zmienić",
-    "CHANGE_ACCOUNTS": "Switch Account",
+    "CHANGE_ACCOUNTS": "Przełącz konto",
     "CONTACT_SUPPORT": "Contact Support",
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Ustawienia profilu",
@@ -135,7 +135,7 @@
   },
   "SIDEBAR": {
     "CONVERSATIONS": "Rozmowy",
-    "ALL_CONVERSATIONS": "All Conversations",
+    "ALL_CONVERSATIONS": "Rozmowy",
     "MENTIONED_CONVERSATIONS": "Wzmianki",
     "REPORTS": "Raporty",
     "SETTINGS": "Ustawienia",
@@ -151,7 +151,7 @@
     "APPLICATIONS": "Applications",
     "LABELS": "Etykiety",
     "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty",
-    "AUTOMATION": "Automation",
+    "AUTOMATION": "Automatyzacja",
     "TEAMS": "Zespoły",
     "CUSTOM_VIEWS_FOLDER": "Folders",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
diff --git a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
index 3aebdc355..a10a789cc 100644
--- a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
@@ -71,29 +71,29 @@
       "AGENT": "AGENT",
       "EMAIL": "EMAIL",
       "BUTTON_TEXT": "Dodaj agentów",
-      "ADD_AGENTS": "Adding Agents to your Team...",
+      "ADD_AGENTS": "Dodaj agenta do swojego zespołu...",
       "SELECT": "wybierz",
-      "SELECT_ALL": "select all agents",
+      "SELECT_ALL": "zaznacz wszystkich agentów",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
     },
     "ADD": {
       "TITLE": "Dodaj agentów do zespołu - %{teamName}",
       "DESC": "Dodaj agentów do swojego nowo utworzonego zespołu. Dzięki temu możesz współpracować jako zespół w rozmowach oraz otrzymywać powiadomienia o nowych wydarzeniach w tej samej rozmowie.",
       "SELECT": "wybierz",
-      "SELECT_ALL": "select all agents",
+      "SELECT_ALL": "zaznacz wszystkich agentów",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Dodaj agentów",
       "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
     },
     "FINISH": {
-      "TITLE": "Your team is ready!",
+      "TITLE": "Twój zespół jest gotowy!",
       "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
       "BUTTON_TEXT": "Zakończ"
     },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
       "API": {
-        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "SUCCESS_MESSAGE": "Zespół został usunięty pomyślnie.",
         "ERROR_MESSAGE": "Couldn't delete the team. Try again."
       },
       "CONFIRM": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
index 2d75cfdee..e67937386 100644
--- a/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
@@ -1,84 +1,84 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "Filtrar Conversas",
+    "SUBTITLE": "Adicione filtros abaixo e pressione 'Aplicar filtros' para filtrar conversas.",
+    "ADD_NEW_FILTER": "Adicionar Filtro",
+    "FILTER_DELETE_ERROR": "Você deve ter pelo menos um filtro para guardar",
+    "SUBMIT_BUTTON_LABEL": "Aplicar filtros",
     "CANCEL_BUTTON_LABEL": "cancelar",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "Limpar Filtros",
+    "EMPTY_VALUE_ERROR": "Valor obrigatório",
+    "TOOLTIP_LABEL": "Filtrar Conversas",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "E",
+      "OR": "OU"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Equal to",
-      "not_equal_to": "Not equal to",
-      "contains": "Contains",
-      "does_not_contain": "Does not contain",
-      "is_present": "Is present",
-      "is_not_present": "Is not present",
-      "is_greater_than": "Is greater than",
-      "is_lesser_than": "Is lesser than"
+      "equal_to": "Igual a",
+      "not_equal_to": "Não é igual a",
+      "contains": "Contém",
+      "does_not_contain": "Não contém",
+      "is_present": "Está presente",
+      "is_not_present": "Não está presente",
+      "is_greater_than": "É maior do que",
+      "is_lesser_than": "É menor do que"
     },
     "ATTRIBUTES": {
       "STATUS": "SItuação",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Nome do Responsável",
       "INBOX_NAME": "Nome Caixa de Entrada",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "Nome da Equipa",
+      "CONVERSATION_IDENTIFIER": "ID da Conversa",
+      "CAMPAIGN_NAME": "Nome da Campanha",
       "LABELS": "Etiquetas",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
-      "CUSTOM_ATTRIBUTE_TEXT": "Text",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+      "BROWSER_LANGUAGE": "Idioma do Navegador",
+      "COUNTRY_NAME": "Nome do País",
+      "REFERER_LINK": "Link de referência",
+      "CUSTOM_ATTRIBUTE_LIST": "Lista",
+      "CUSTOM_ATTRIBUTE_TEXT": "Texto",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Número",
+      "CUSTOM_ATTRIBUTE_LINK": "Endereço",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Caixa de Seleção"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "Filtros Padrão",
+      "ADDITIONAL_FILTERS": "Filtros Adicionais",
       "CUSTOM_ATTRIBUTES": "Atributos personalizados"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
-        "ERROR_MESSAGE": "Name is required",
-        "SAVE_BUTTON": "Save filter",
+        "TITLE": "Deseja guardar este filtro?",
+        "LABEL": "Nome do Filtro",
+        "PLACEHOLDER": "Insira um nome para este filtro",
+        "ERROR_MESSAGE": "Nome é obrigatório",
+        "SAVE_BUTTON": "Guardar Filtro",
         "CANCEL_BUTTON": "cancelar",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "Pasta criada com sucesso",
+          "ERROR_MESSAGE": "Erro ao criar a pasta"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "Segmento criado com sucesso",
+          "ERROR_MESSAGE": "Erro ao criar segmento"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Apagar filtro",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Confirmar Exclusão",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "Tem a certeza que deseja apagar o filtro ",
             "YES": "Sim, excluir",
             "NO": "Não, mantenha isso"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "Pasta criada com sucesso",
+          "ERROR_MESSAGE": "Erro ao apagar a pasta"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "Segmento apagado com sucesso",
+          "ERROR_MESSAGE": "Erro ao apagar segmento"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 01d33203a..9aacd0dd0 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -179,8 +179,8 @@
     "SEARCH_BUTTON": "Procurar",
     "SEARCH_INPUT_PLACEHOLDER": "Procurar por contatos",
     "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS_SAVE": "Guardar Filtro",
+    "FILTER_CONTACTS_DELETE": "Apagar filtro",
     "LIST": {
       "LOADING_MESSAGE": "A carregar contatos...",
       "404": "Nenhum contato corresponde à sua pesquisa 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contactFilters.json b/app/javascript/dashboard/i18n/locale/pt/contactFilters.json
index 2d009a8cc..faeefdef1 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contactFilters.json
@@ -2,27 +2,27 @@
     "CONTACTS_FILTER": {
         "TITLE": "Filter Contacts",
         "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
+        "ADD_NEW_FILTER": "Adicionar Filtro",
         "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "FILTER_DELETE_ERROR": "Você deve ter pelo menos um filtro para guardar",
         "SUBMIT_BUTTON_LABEL": "submeter",
         "CANCEL_BUTTON_LABEL": "cancelar",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
+        "CLEAR_BUTTON_LABEL": "Limpar Filtros",
+        "EMPTY_VALUE_ERROR": "Valor obrigatório",
         "TOOLTIP_LABEL": "Filter contacts",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "E",
+            "OR": "OU"
         },
         "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
-            "not_equal_to": "Not equal to",
-            "contains": "Contains",
-            "does_not_contain": "Does not contain",
-            "is_present": "Is present",
-            "is_not_present": "Is not present",
-            "is_greater_than": "Is greater than",
-            "is_lesser_than": "Is lesser than"
+            "equal_to": "Igual a",
+            "not_equal_to": "Não é igual a",
+            "contains": "Contém",
+            "does_not_contain": "Não contém",
+            "is_present": "Está presente",
+            "is_not_present": "Não está presente",
+            "is_greater_than": "É maior do que",
+            "is_lesser_than": "É menor do que"
         },
         "ATTRIBUTES": {
             "NAME": "Nome:",
@@ -31,15 +31,15 @@
             "IDENTIFIER": "Identifier",
             "CITY": "Cidade",
             "COUNTRY": "País",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
-            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
+            "CUSTOM_ATTRIBUTE_LIST": "Lista",
+            "CUSTOM_ATTRIBUTE_TEXT": "Texto",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Número",
+            "CUSTOM_ATTRIBUTE_LINK": "Endereço",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Caixa de Seleção"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "Filtros Padrão",
+            "ADDITIONAL_FILTERS": "Filtros Adicionais",
             "CUSTOM_ATTRIBUTES": "Atributos personalizados"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 01a4aead1..6f3e3862e 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Para",
     "BCC": "BCC",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index f2cf97471..be1033d73 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 0949248c3..943fae04d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Para",
     "BCC": "CCO",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index a5370d4f1..80a9f2999 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domínio",
         "PLACE_HOLDER": "Domínio"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index d62acaf9a..0af5f7580 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "către",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 4783ef362..7e0116deb 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domeniu",
         "PLACE_HOLDER": "Domeniu"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 8a531ca3e..320e5ee7c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Кому",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 7a9f58e99..5bfbf7bc9 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Домен",
         "PLACE_HOLDER": "Домен"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 724103283..eed52bdc8 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Pre",
     "BCC": "Skrytá kópia",
     "CC": "Kópia",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index e722183ec..3a662c7ea 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 2bf23d8a1..6849485e7 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "Till",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 0e6c974fb..ddee51ab7 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index c911657f5..1af131809 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 7043e793c..29a9d0dcf 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "களம்",
         "PLACE_HOLDER": "களம்"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index 4d89fee86..8ea0b1ace 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "ถึง",
     "BCC": "สำเนาลับ",
     "CC": "สำเนา",
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 653e51fd1..7d9d4cb56 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 167425712..edf795719 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "ya",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 8b2dda18a..8e469ca4b 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index d642db45e..72ad9fda4 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index c3262554b..ce72b622b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
index 426785ab6..711b8e0ce 100644
--- a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
@@ -1,84 +1,84 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "Lọc cuộc trò chuyện",
+    "SUBTITLE": "Thêm bộ lọc bên dưới và ấn 'áp dụng bộ lọc' để lọc cuộc trò chuyện.",
+    "ADD_NEW_FILTER": "Thêm Bộ lọc",
+    "FILTER_DELETE_ERROR": "Bạn nên có ít nhất 1 bộ lọc để lưu",
+    "SUBMIT_BUTTON_LABEL": "Áp dụng bộ lọc",
     "CANCEL_BUTTON_LABEL": "Huỷ",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "Xoá bộ lọc",
+    "EMPTY_VALUE_ERROR": "Giá trị bắt buộc có",
+    "TOOLTIP_LABEL": "Lọc cuộc trò chuyện",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "VÀ",
+      "OR": "HOẶC"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Equal to",
-      "not_equal_to": "Not equal to",
-      "contains": "Contains",
-      "does_not_contain": "Does not contain",
-      "is_present": "Is present",
-      "is_not_present": "Is not present",
-      "is_greater_than": "Is greater than",
-      "is_lesser_than": "Is lesser than"
+      "equal_to": "Bằng",
+      "not_equal_to": "Không bằng",
+      "contains": "Bao gồm",
+      "does_not_contain": "Không bao gồm",
+      "is_present": "Có",
+      "is_not_present": "Không có",
+      "is_greater_than": "Lớn hơn",
+      "is_lesser_than": "Nhỏ hơn"
     },
     "ATTRIBUTES": {
       "STATUS": "Trạng thái",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Tên Người được phân công",
       "INBOX_NAME": "Tên hộp thư đến",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "Tên Nhóm",
+      "CONVERSATION_IDENTIFIER": "Định danh cuộc trò chuyện",
+      "CAMPAIGN_NAME": "Tên Chiến dịch",
       "LABELS": "Nhãn",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
-      "CUSTOM_ATTRIBUTE_TEXT": "Text",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "BROWSER_LANGUAGE": "Ngôn ngữ của Trình duyệt",
+      "COUNTRY_NAME": "Tên Nước",
+      "REFERER_LINK": "Liên kết người giới thiệu",
+      "CUSTOM_ATTRIBUTE_LIST": "Danh sách",
+      "CUSTOM_ATTRIBUTE_TEXT": "Văn bản",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Số",
+      "CUSTOM_ATTRIBUTE_LINK": "Liên kết",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "Bộ lọc tiêu chuẩn",
+      "ADDITIONAL_FILTERS": "Bộ lọc bổ sung",
       "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
-        "ERROR_MESSAGE": "Name is required",
-        "SAVE_BUTTON": "Save filter",
+        "TITLE": "Bạn có muốn lưu bộ lọc này không?",
+        "LABEL": "Đặt tên bộ lọc này",
+        "PLACEHOLDER": "Điền tên cho bộ lọc này",
+        "ERROR_MESSAGE": "Tên bắt buộc có",
+        "SAVE_BUTTON": "Lưu bộ lọc",
         "CANCEL_BUTTON": "Huỷ",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "Thư mục được tạo thành công",
+          "ERROR_MESSAGE": "Có lỗi xảy ra lúc tạo thư mục"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "Phân khúc được tạo thành công",
+          "ERROR_MESSAGE": "Có lỗi xảy ra lúc tạo phân khúc"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Xoá bộ lọc",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Xác nhận xoá",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "Bạn có chắc chắn muốn xoá bộ lọc ",
             "YES": "Có, Xoá",
             "NO": "Không, Giữ"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "Thư mục bị xoá thành công",
+          "ERROR_MESSAGE": "Có lỗi xảy ra lúc xoá thư mục"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "Phân khúc được xoá thành công",
+          "ERROR_MESSAGE": "Có lỗi xảy ra lúc xoá phân khúc"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json b/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
index ba55acca8..5b6380ab0 100644
--- a/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
@@ -93,7 +93,7 @@
       "NO_RESULTS": "Không tìm thấy kết quả."
     },
     "MULTI_SELECTOR": {
-      "PLACEHOLDER": "None",
+      "PLACEHOLDER": "Không có",
       "TITLE": {
         "AGENT": "Chọn thành viên",
         "TEAM": "Chọn nhóm"
diff --git a/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
index e850e0888..4b7de84c4 100644
--- a/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
@@ -1,98 +1,98 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "Thuộc tính tùy chỉnh",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
-    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "HEADER_BTN_TXT": "Thêm thuộc tính Tùy chỉnh",
+    "LOADING": "Đang lấy thuộc tính tuỳ chỉnh",
+    "SIDEBAR_TXT": "<p><b>Thuộc tính tùy chỉnh</b> <p>Thuộc tính tùy chỉnh theo dõi thông tin thực tế về các địa chỉ liên hệ/cuộc trò chuyện của bạn - như gói đăng ký hoặc khi họ đặt hàng mặt hàng đầu tiên, v. v. <br /><br />Để tạo một Thuộc tính Tùy chỉnh, chỉ cần nhấp vào <b>Thêm Thuộc tính Tùy chỉnh.</b> Bạn cũng có thể chỉnh sửa hoặc xóa Thuộc tính Tùy chỉnh hiện có bằng cách nhấp vào nút Chỉnh sửa hoặc Xóa.</p>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "Thêm thuộc tính Tùy chỉnh",
       "SUBMIT": "Tạo",
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "FORM": {
         "NAME": {
-          "LABEL": "Display Name",
-          "PLACEHOLDER": "Enter custom attribute display name",
-          "ERROR": "Name is required"
+          "LABEL": "Tên hiển thị",
+          "PLACEHOLDER": "Điền tên hiển thị của thuộc tính tuỳ chỉnh",
+          "ERROR": "Tên bắt buộc có"
         },
         "DESC": {
           "LABEL": "Mô tả",
-          "PLACEHOLDER": "Enter custom attribute description",
-          "ERROR": "Description is required"
+          "PLACEHOLDER": "Điền mô tả của thuộc tính tuỳ chỉnh",
+          "ERROR": "Mô tả bắt buộc có"
         },
         "MODEL": {
-          "LABEL": "Applies to",
-          "PLACEHOLDER": "Please select one",
-          "ERROR": "Model is required"
+          "LABEL": "Áp dụng cho",
+          "PLACEHOLDER": "Vui lòng chọn một",
+          "ERROR": "Mô hình bắt buộc có"
         },
         "TYPE": {
-          "LABEL": "Type",
-          "PLACEHOLDER": "Please select a type",
-          "ERROR": "Type is required",
+          "LABEL": "Loại",
+          "PLACEHOLDER": "Vui lòng chọn một loại",
+          "ERROR": "Loại bắt buộc có",
           "LIST": {
-            "LABEL": "List Values",
-            "PLACEHOLDER": "Please enter value and press enter key",
-            "ERROR": "Must have at least one value"
+            "LABEL": "Giá trị của danh sách",
+            "PLACEHOLDER": "Vui lòng điền giá trị và ấn phím enter",
+            "ERROR": "Phải có ít nhất 1 giá trị"
           }
         },
         "KEY": {
-          "LABEL": "Key",
-          "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "LABEL": "Khoá",
+          "PLACEHOLDER": "Điền khoá của thuộc tính tuỳ chỉnh",
+          "ERROR": "Khoá cần có",
+          "IN_VALID": "Khoá không hợp lệ"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
-        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+        "SUCCESS_MESSAGE": "Thuộc tính tuỳ chỉnh thêm thành công",
+        "ERROR_MESSAGE": "Không thể tạo thuộc tính tuỳ chỉnh, Vui lòng thử lại sau"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Xoá",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "SUCCESS_MESSAGE": "Thuộc tính tuỳ chỉnh xoá thành công.",
+        "ERROR_MESSAGE": "Không thể xoá thuộc tính tuỳ chỉnh. Thử lại."
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{attributeName}",
-        "PLACE_HOLDER": "Please type {attributeName} to confirm",
-        "MESSAGE": "Deleting will remove the custom attribute",
+        "TITLE": "Bạn có chắc muốn xoá - %{attributeName}",
+        "PLACE_HOLDER": "Vui lòng điền {attributeName} để xác nhận",
+        "MESSAGE": "Xoá sẽ xoá thuộc tính tuỳ chỉnh",
         "YES": "Xoá ",
         "NO": "Huỷ"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Custom Attribute",
+      "TITLE": "Sửa Thuộc tính Tùy chỉnh",
       "UPDATE_BUTTON_TEXT": "Cập nhật",
       "TYPE": {
         "LIST": {
-          "LABEL": "List Values",
-          "PLACEHOLDER": "Please enter values and press enter key"
+          "LABEL": "Giá trị của danh sách",
+          "PLACEHOLDER": "Vui lòng điền giá trị và ấn phím enter"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
-        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+        "SUCCESS_MESSAGE": "Thuộc tính tuỳ chỉnh sửa thành công",
+        "ERROR_MESSAGE": "Đã xảy ra lỗi khi cập nhật \bthuộc tính tuỳ chỉnh, vui lòng thử lại"
       }
     },
     "TABS": {
       "HEADER": "Thuộc tính tùy chỉnh",
-      "CONVERSATION": "Conversation",
-      "CONTACT": "Contact"
+      "CONVERSATION": "Cuộc trò chuyện",
+      "CONTACT": "Danh bạ"
     },
     "LIST": {
       "TABLE_HEADER": [
         "Tên",
         "Mô tả",
-        "Type",
-        "Key"
+        "Loại",
+        "Khoá"
       ],
       "BUTTONS": {
         "EDIT": "Chỉnh sửa",
         "DELETE": "Xoá"
       },
       "EMPTY_RESULT": {
-        "404": "There are no custom attributes created",
-        "NOT_FOUND": "There are no custom attributes configured"
+        "404": "Không có thuộc tính tuỳ chỉnh nào được tạo",
+        "NOT_FOUND": "Không có thuộc tính tuỳ chỉnh nào được cấu hình"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/vi/automation.json b/app/javascript/dashboard/i18n/locale/vi/automation.json
index 93a32c9f2..2857fd98e 100644
--- a/app/javascript/dashboard/i18n/locale/vi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/automation.json
@@ -1,81 +1,81 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automation",
-    "HEADER_BTN_TXT": "Add Automation Rule",
-    "LOADING": "Fetching automation rules",
-    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "HEADER": "Tự động hoá",
+    "HEADER_BTN_TXT": "Thêm Quy tắc Tự động hoá",
+    "LOADING": "Đang lấy quy tắc tự động hoá",
+    "SIDEBAR_TXT": "<p><b>Quy tắc tự động hóa</b> <p>Tự động hóa có thể thay thế và tự động hóa các quy trình hiện có mà cần thao tác thủ công. Bạn có thể làm nhiều việc với tự động hóa, bao gồm thêm nhãn và gán cuộc trò chuyện cho người đại diện tốt nhất. Vì vậy, nhóm tập trung vào những gì họ làm tốt nhất và dành ít thời gian hơn cho các công việc thủ công.</p>",
     "ADD": {
-      "TITLE": "Add Automation Rule",
+      "TITLE": "Thêm Quy tắc Tự động hoá",
       "SUBMIT": "Tạo",
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
-          "ERROR": "Name is required"
+          "LABEL": "Tên Quy tắc",
+          "PLACEHOLDER": "Điền tên quy tắc",
+          "ERROR": "Tên bắt buộc có"
         },
         "DESC": {
           "LABEL": "Mô tả",
-          "PLACEHOLDER": "Enter rule description",
-          "ERROR": "Description is required"
+          "PLACEHOLDER": "Điền mô tả quy tắc",
+          "ERROR": "Mô tả bắt buộc có"
         },
         "EVENT": {
-          "LABEL": "Event",
-          "PLACEHOLDER": "Please select one",
-          "ERROR": "Event is required"
+          "LABEL": "Sự kiện",
+          "PLACEHOLDER": "Vui lòng chọn một",
+          "ERROR": "Sự kiện bắt buộc có"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "Điều kiện"
         },
         "ACTIONS": {
           "LABEL": "Hành động"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "Thêm Điều kiện",
+      "ACTION_BUTTON_LABEL": "Thêm Hành động",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
-        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Quy tắc tự động hoá thêm thành công",
+        "ERROR_MESSAGE": "Không thể tạo quy tắc tự động hoá, Vui lòng thử lại sau"
       }
     },
     "LIST": {
       "TABLE_HEADER": [
         "Tên",
         "Mô tả",
-        "Active",
-        "Created on"
+        "Có hiệu lực",
+        "Được tạo trên"
       ],
-      "404": "No automation rules found"
+      "404": "Không tìm thấy quy tắc tự động hoá"
     },
     "DELETE": {
-      "TITLE": "Delete Automation Rule",
+      "TITLE": "Xoá Quy tắc Tự động hoá",
       "SUBMIT": "Xoá",
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "CONFIRM": {
         "TITLE": "Xác nhận xoá",
-        "MESSAGE": "Bạn có muốn xoá? ",
+        "MESSAGE": "Bạn có chắc muốn xoá ",
         "YES": "Có, xoá ",
         "NO": "Không, giữ "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Quy tắc tự động hoá xoá thành công",
+        "ERROR_MESSAGE": "Không thể xoá quy tắc tự động hoá, Vui lòng thử lại sau"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Automation Rule",
+      "TITLE": "Sửa Quy tắc Tự động hoá",
       "SUBMIT": "Chỉnh sửa",
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule updated successfully",
-        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Quy tắc tự động hoá thêm thành công",
+        "ERROR_MESSAGE": "Không thể cập nhật quy tắc tự động hoá, Vui lòng thử lại sau"
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "Mô phỏng",
       "API": {
-        "SUCCESS_MESSAGE": "Automation cloned successfully",
-        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Quy tắc tự động hoá mô phỏng thành công",
+        "ERROR_MESSAGE": "Không thể mô phỏng quy tắc tự động hoá, Vui lòng thử lại sau"
       }
     },
     "FORM": {
@@ -83,7 +83,7 @@
       "CREATE": "Tạo",
       "DELETE": "Xoá",
       "CANCEL": "Huỷ",
-      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+      "RESET_MESSAGE": "Thay đổi loại sự kiện sẽ đặt lại điều kiện và sự kiện mà bạn đã thêm bên dưới"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/campaign.json b/app/javascript/dashboard/i18n/locale/vi/campaign.json
index e22283645..cc64682c0 100644
--- a/app/javascript/dashboard/i18n/locale/vi/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/vi/campaign.json
@@ -1,126 +1,126 @@
 {
   "CAMPAIGN": {
-    "HEADER": "Campaigns",
-    "SIDEBAR_TXT": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations. Click on <b>Add Campaign</b> to create a new campaign. You can also edit or delete an existing campaign by clicking on the Edit or Delete button.",
+    "HEADER": "Chiến dịch",
+    "SIDEBAR_TXT": "Tin nhắn chủ động cho phép khách hàng gửi tin nhắn đi đến các liên hệ của họ, điều này sẽ kích hoạt nhiều cuộc trò chuyện hơn. Nhấp vào <b>Thêm Chiến dịch</b> để tạo một chiến dịch mới. Bạn cũng có thể chỉnh sửa hoặc xóa chiến dịch hiện tại bằng cách nhấp vào nút Chỉnh sửa hoặc Xóa.",
     "HEADER_BTN_TXT": {
-      "ONE_OFF": "Create a one off campaign",
-      "ONGOING": "Create a ongoing campaign"
+      "ONE_OFF": "Tạo chiến dịch một lần",
+      "ONGOING": "Tạo chiến dịch đang diễn ra"
     },
     "ADD": {
-      "TITLE": "Create a campaign",
-      "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
+      "TITLE": "Tạo một chiến dịch",
+      "DESC": "Tin nhắn chủ động cho phép khách hàng gửi tin nhắn đi đến các liên hệ của họ, điều này sẽ kích hoạt nhiều cuộc trò chuyện hơn.",
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "CREATE_BUTTON_TEXT": "Tạo",
       "FORM": {
         "TITLE": {
-          "LABEL": "Title",
-          "PLACEHOLDER": "Please enter the title of campaign",
-          "ERROR": "Title is required"
+          "LABEL": "Tiêu đề",
+          "PLACEHOLDER": "Vui lòng điền tiêu đề của chiến dịch",
+          "ERROR": "Tiêu đề bắt buộc có"
         },
         "SCHEDULED_AT": {
-          "LABEL": "Scheduled time",
-          "PLACEHOLDER": "Please select the time",
-          "CONFIRM": "Confirm",
-          "ERROR": "Scheduled time is required"
+          "LABEL": "Thời gian dự kiến",
+          "PLACEHOLDER": "Vui lòng chọn thời gian",
+          "CONFIRM": "Xác nhận",
+          "ERROR": "Thời gian dự kiến là bắt buộc"
         },
         "AUDIENCE": {
-          "LABEL": "Audience",
-          "PLACEHOLDER": "Select the customer labels",
-          "ERROR": "Audience is required"
+          "LABEL": "Khán giả",
+          "PLACEHOLDER": "Chọn nhãn người dùng",
+          "ERROR": "Khán giả bắt buộc có"
         },
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox",
-          "ERROR": "Inbox is required"
+          "LABEL": "Chọn Hộp thư đến",
+          "PLACEHOLDER": "Chọn Hộp thư đến",
+          "ERROR": "Hộp thư đến bắt buộc có"
         },
         "MESSAGE": {
           "LABEL": "Tin nhắn",
-          "PLACEHOLDER": "Please enter the message of campaign",
-          "ERROR": "Message is required"
+          "PLACEHOLDER": "Vui lòng điền thông điệp của chiến dịch",
+          "ERROR": "Thông điệp bắt buộc có"
         },
         "SENT_BY": {
-          "LABEL": "Sent by",
-          "PLACEHOLDER": "Please select the the content of campaign",
-          "ERROR": "Sender is required"
+          "LABEL": "Gửi bởi",
+          "PLACEHOLDER": "Vui lòng chọn nội dung của chiến dịch",
+          "ERROR": "Người gửi cần có"
         },
         "END_POINT": {
           "LABEL": "URL",
-          "PLACEHOLDER": "Please enter the URL",
+          "PLACEHOLDER": "Vui lòng nhập URL",
           "ERROR": "Vui lòng nhập một URL hợp lệ"
         },
         "TIME_ON_PAGE": {
-          "LABEL": "Time on page(Seconds)",
-          "PLACEHOLDER": "Please enter the time",
-          "ERROR": "Time on page is required"
+          "LABEL": "Thời gian trên trang(Giây)",
+          "PLACEHOLDER": "Vui lòng nhập thời gian",
+          "ERROR": "Thời gian trên trang là bắt buộc"
         },
-        "ENABLED": "Enable campaign",
-        "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
-        "SUBMIT": "Add Campaign"
+        "ENABLED": "Vận hành chiến dịch",
+        "TRIGGER_ONLY_BUSINESS_HOURS": "Chỉ kích hoạt trong giờ làm việc",
+        "SUBMIT": "Thêm Chiến dịch"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Campaign created successfully",
-        "ERROR_MESSAGE": "There was an error. Please try again."
+        "SUCCESS_MESSAGE": "Chiến dịch được tạo thành công",
+        "ERROR_MESSAGE": "Đã có lỗi. Vui lòng thử lại."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Xoá",
       "CONFIRM": {
         "TITLE": "Xác nhận xoá",
-        "MESSAGE": "Are you sure to delete?",
+        "MESSAGE": "Bạn có chắc muốn xoá?",
         "YES": "Có, xoá ",
         "NO": "Không, giữ "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Campaign deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the campaign. Please try again later."
+        "SUCCESS_MESSAGE": "Chiến dịch được xoá thành công",
+        "ERROR_MESSAGE": "Không thể xoá chiến dịch. Vui lòng thử lại sau."
       }
     },
     "EDIT": {
-      "TITLE": "Edit campaign",
+      "TITLE": "Sửa chiến dịch",
       "UPDATE_BUTTON_TEXT": "Cập nhật",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign updated successfully",
+        "SUCCESS_MESSAGE": "Chiến dịch được cập nhật thành công",
         "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
       }
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading campaigns...",
-      "404": "There are no campaigns created for this inbox.",
+      "LOADING_MESSAGE": "Đang tải chiến dịch...",
+      "404": "Không có chiến dịch được tạo cho hộp thư đến này.",
       "TABLE_HEADER": {
-        "TITLE": "Title",
+        "TITLE": "Tiêu đề",
         "MESSAGE": "Tin nhắn",
-        "INBOX": "Inbox",
+        "INBOX": "Hộp thư đến",
         "STATUS": "Trạng thái",
-        "SENDER": "Sender",
+        "SENDER": "Người gửi",
         "URL": "URL",
-        "SCHEDULED_AT": "Scheduled time",
-        "TIME_ON_PAGE": "Time(Seconds)",
-        "CREATED_AT": "Created at"
+        "SCHEDULED_AT": "Thời gian dự kiến",
+        "TIME_ON_PAGE": "Thời gian(Giây)",
+        "CREATED_AT": "Tạo vào lúc"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "Thêm",
         "EDIT": "Chỉnh sửa",
         "DELETE": "Xoá"
       },
       "STATUS": {
         "ENABLED": "Bật",
         "DISABLED": "Tắt",
-        "COMPLETED": "Completed",
-        "ACTIVE": "Active"
+        "COMPLETED": "Hoàn tất",
+        "ACTIVE": "Có hiệu lực"
       },
       "SENDER": {
         "BOT": "Bot"
       }
     },
     "ONE_OFF": {
-      "HEADER": "One off campaigns",
-      "404": "There are no one off campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an sms inbox and start adding campaigns"
+      "HEADER": "Chiến dịch một lần",
+      "404": "Không có chiến dịch một lần nào được tạo",
+      "INBOXES_NOT_FOUND": "Vui lòng tạo một hộp thư đến sms và bắt đầu thêm chiến dịch"
     },
     "ONGOING": {
-      "HEADER": "Ongoing campaigns",
-      "404": "There are no ongoing campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+      "HEADER": "Chiến dịch đang diễn ra",
+      "404": "Không có chiến dịch đang diễn ra nào được tạo",
+      "INBOXES_NOT_FOUND": "Vui lòng tạo hộp thư đến cho trang web và bắt đầu thêm chiến dịch"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
index 9c6ac312d..d0c620902 100644
--- a/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
@@ -4,25 +4,25 @@
     "HEADER_BTN_TXT": "Thêm thư mẫu phẩn hồi",
     "LOADING": "Đang tải thư mẫu phẩn hồi",
     "SEARCH_404": "Không có kết quả nào được tìm thấy",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "SIDEBAR_TXT": "<p><b>Thư mẫu phản hồi</b> </p><p> Thư mẫu phản hồi là các mẫu trả lời đã lưu có thể được sử dụng để nhanh chóng gửi trả lời cho một cuộc trò chuyện. </p><p> Để tạo một Thư mẫu phản hồi, chỉ cần ấn vào <b>Thêm Thư mẫu phẩn hồi</b>. Bạn cũng có thể sửa hoặc xoá Thư mẫu phản hồi \bbằng cách ấn nút Sửa hoặc Xoá </p><p> Thư mẫu phản hồi được sử dụng với sự giúp đỡ của <b>Mã Ngắn</b>. Nhân viên có thể truy cập thư mẫu phản hồi khi trò chuyện bằng cách nhập <b>'/'</b>. </p>",
     "LIST": {
       "404": "Không có câu trả lời soạn trước nào có sẵn trong tài khoản này.",
       "TITLE": "Quản lý thư mẫu phẩn hồi",
       "DESC": "Thư mẫu phẩn hồi là các mẫu trả lời được xác định trước có thể được sử dụng để nhanh chóng gửi trả lời cho vé.",
       "TABLE_HEADER": [
-        "Short Code",
+        "Mã Ngắn",
         "Nội dung",
         "Hành động"
       ]
     },
     "ADD": {
       "TITLE": "Thêm thư mẫu phẩn hồi",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Thư mẫu phản hồi là các mẫu trả lời đã lưu có thể được sử dụng để nhanh chóng gửi trả lời cho cuộc trò chuyện.",
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a short code",
+          "LABEL": "Mã Ngắn",
+          "PLACEHOLDER": "Vui lòng nhập một mã ngắn",
           "ERROR": "Short Code là bắt buộc"
         },
         "CONTENT": {
@@ -42,7 +42,7 @@
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
+          "LABEL": "Mã Ngắn",
           "PLACEHOLDER": "Vui lòng nhập shortcode",
           "ERROR": "Short Code là bắt buộc"
         },
diff --git a/app/javascript/dashboard/i18n/locale/vi/chatlist.json b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
index 58eb55608..048c7dffc 100644
--- a/app/javascript/dashboard/i18n/locale/vi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
@@ -7,7 +7,7 @@
       "404": "Không có bất kì hoạt động trò chuyện nào trong nhóm."
     },
     "TAB_HEADING": "Các cuộc hội thoại",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "Nhắn đến",
     "SEARCH": {
       "INPUT": "Tìm kiếm cho người, đoạn chat, lưu trữ trả lời .."
     },
@@ -47,10 +47,10 @@
         "TEXT": "Đã được giải quyết"
       },
       "pending": {
-        "TEXT": "Pending"
+        "TEXT": "Chờ giải quyết"
       },
       "snoozed": {
-        "TEXT": "Snoozed"
+        "TEXT": "Tạm dừng"
       }
     },
     "ATTACHMENTS": {
@@ -76,10 +76,10 @@
     "RECEIVED_VIA_EMAIL": "Nhận được từ email",
     "VIEW_TWEET_IN_TWITTER": "Xem tweet trên Twitter",
     "REPLY_TO_TWEET": "Trả lời cho tweet này",
-    "SENT": "Sent successfully",
+    "SENT": "Gửi thành công",
     "NO_MESSAGES": "Không có tin nhắn",
     "NO_CONTENT": "Không có nội dung",
-    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "HIDE_QUOTED_TEXT": "Ân Văn bản được trích dẫn",
+    "SHOW_QUOTED_TEXT": "Hiện Văn bản được trích dẫn"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index a06bd3763..898bcc47b 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "Công ty",
     "LOCATION": "Vị trí",
     "CONVERSATION_TITLE": "Chi tiết của cuộc trò chuyện",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "Xem hồ sơ cá nhân",
     "BROWSER": "Trình duyệt",
     "OS": "Hệ điều hành",
     "INITIATED_FROM": "Bắt đầu từ",
@@ -20,30 +20,30 @@
     },
     "LABELS": {
       "CONTACT": {
-        "TITLE": "Contact Labels",
-        "ERROR": "Couldn't update labels"
+        "TITLE": "Nhãn danh bạ",
+        "ERROR": "Không thể sửa nhãn"
       },
       "CONVERSATION": {
         "TITLE": "Nhãn hội thoại",
-        "ADD_BUTTON": "Add Labels"
+        "ADD_BUTTON": "Thêm nhãn"
       },
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "Thêm nhãn",
+        "PLACEHOLDER": "Tìm nhãn",
+        "NO_RESULT": "Không tìm thấy nhãn"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
+    "MERGE_CONTACT": "Gộp liên lạc",
+    "CONTACT_ACTIONS": "Hành động của liên lạc",
     "MUTE_CONTACT": "Tắt tiếng cuộc trò chuyện",
-    "UNMUTE_CONTACT": "Unmute Conversation",
+    "UNMUTE_CONTACT": "Bật tiếng cuộc trò chuyện",
     "MUTED_SUCCESS": "Cuộc trò chuyện này bị tắt tiếng trong 6 giờ",
-    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "UNMUTED_SUCCESS": "Cuộc trò chuyện này được bật tiếng",
     "SEND_TRANSCRIPT": "Gửi bản ghi",
     "EDIT_LABEL": "Chỉnh sửa",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh",
-      "CONTACT_LABELS": "Contact Labels",
+      "CONTACT_LABELS": "Nhãn danh bạ",
       "PREVIOUS_CONVERSATIONS": "Cuộc trò chuyện trước đó"
     }
   },
@@ -53,37 +53,37 @@
     "DESC": "Chỉnh sửa liên hệ chi tiết"
   },
   "CREATE_CONTACT": {
-    "BUTTON_LABEL": "New Contact",
-    "TITLE": "Create new contact",
-    "DESC": "Add basic information details about the contact."
+    "BUTTON_LABEL": "Liên lạc mới",
+    "TITLE": "Tạo liên lạc mới",
+    "DESC": "Thêm thông tin cơ bản về liên lạc."
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "Import",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "BUTTON_LABEL": "Nhập",
+    "TITLE": "Nhập liên lạc",
+    "DESC": "Nhập liên lạc qua một file CSV.",
+    "DOWNLOAD_LABEL": "Tải xuống file CSV mẫu.",
     "FORM": {
       "LABEL": "CSV File",
-      "SUBMIT": "Import",
+      "SUBMIT": "Nhập",
       "CANCEL": "Huỷ"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "Liên hệ được lưu thành công",
     "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
   },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "Xoá liên lạc",
+    "TITLE": "Xoá liên lạc",
+    "DESC": "Xoá chi tiết liên hệ",
     "CONFIRM": {
       "TITLE": "Xác nhận xoá",
       "MESSAGE": "Bạn có muốn xoá? ",
-      "PLACE_HOLDER": "Please type {contactName} to confirm",
+      "PLACE_HOLDER": "Vui lòng nhập {contactName} để xác nhận",
       "YES": "Có, xoá ",
       "NO": "Không, giữ "
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "Liên hệ đã được xóa thành công",
+      "ERROR_MESSAGE": "Không thể xoá liên hệ. Vui lòng thử lại sau."
     }
   },
   "CONTACT_FORM": {
@@ -109,9 +109,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Nhập số điện thoại của liên hệ",
         "LABEL": "Số điện thoại",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
-        "ERROR": "Phone number should be either empty or of E.164 format",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "HELP": "Số điện thoại phải thuộc định đạng E.164 như: +1415555555 [+][mã nước][mã khu vực][số điện thoại vùng]",
+        "ERROR": "Số điện thoại nên rỗng hoặc thuộc định dạng E.164",
+        "DUPLICATE": "Số điện thoại này đang được dùng cho một liên hệ khác."
       },
       "LOCATION": {
         "PLACEHOLDER": "Nhập vị trí của liên hệ",
@@ -140,192 +140,192 @@
         }
       }
     },
-    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "SUCCESS_MESSAGE": "Liên hệ được lưu thành công",
     "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
-    "TITLE": "New conversation",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "BUTTON_LABEL": "Bắt đầu cuộc trò chuyện",
+    "TITLE": "Tạo mới cuộc trò chuyện",
+    "DESC": "Bắt đầu một cuộc trò chuyện mới bằng cách thêm tin nhắn.",
+    "NO_INBOX": "Không tìm thấy hộp thư đến để bắt đầu cuộc trò chuyện với liên hệ này.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "Đến"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Hộp thư đến",
+        "ERROR": "Chọn Hộp thư đến"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "Chủ đề",
+        "PLACEHOLDER": "Chủ đề",
+        "ERROR": "Chủ đề không được rỗng"
       },
       "MESSAGE": {
         "LABEL": "Tin nhắn",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "PLACEHOLDER": "Viết tin nhắn ở đây",
+        "ERROR": "Tin nhắn không được rỗng"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "Gửi tin nhắn",
       "CANCEL": "Huỷ",
-      "SUCCESS_MESSAGE": "Message sent!",
+      "SUCCESS_MESSAGE": "Tin nhắn đã được gửi!",
       "GO_TO_CONVERSATION": "Xem",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "ERROR_MESSAGE": "Không thể gửi! xin thử lại"
     }
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "FIELDS": "Contact fields",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "HEADER": "Liên hệ",
+    "FIELDS": "Trường của liên hệ",
+    "SEARCH_BUTTON": "Tìm kiếm",
+    "SEARCH_INPUT_PLACEHOLDER": "Tìm kiếm liên hệ",
+    "FILTER_CONTACTS": "Lọc",
+    "FILTER_CONTACTS_SAVE": "Lưu bộ lọc",
+    "FILTER_CONTACTS_DELETE": "Xoá bộ lọc",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "LOADING_MESSAGE": "Đang tải liên hệ...",
+      "404": "Không có liên hệ nào khớp với tìm kiếm của bạn 🔍",
+      "NO_CONTACTS": "Không có liên hệ nào có sẵn",
       "TABLE_HEADER": {
         "NAME": "Tên",
         "PHONE_NUMBER": "Số điện thoại",
         "CONVERSATIONS": "Các cuộc hội thoại",
-        "LAST_ACTIVITY": "Last Activity",
-        "COUNTRY": "Country",
-        "CITY": "City",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "LAST_ACTIVITY": "Hành động cuối cùng",
+        "COUNTRY": "Quốc gia",
+        "CITY": "Tỉnh / Thành phố",
+        "SOCIAL_PROFILES": "Hồ sơ xã hội",
         "COMPANY": "Công ty",
         "EMAIL_ADDRESS": "Email"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "Xem thông tin chi tiết"
     }
   },
   "CONTACT_PROFILE": {
-    "BACK_BUTTON": "Contacts",
-    "LOADING": "Loading contact profile..."
+    "BACK_BUTTON": "Liên hệ",
+    "LOADING": "Đang tải hồ sơ liên hệ..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
-      "TITLE": "Shift + Enter to create a task"
+      "BUTTON": "Thêm",
+      "TITLE": "Ấn Shift + Enter để thêm công việc"
     },
     "FOOTER": {
-      "DUE_DATE": "Due date",
-      "LABEL_TITLE": "Set type"
+      "DUE_DATE": "Ngày đáo hạn",
+      "LABEL_TITLE": "Đặt loại"
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "Đang tải về ghi chú...",
+    "NOT_AVAILABLE": "Không có ghi chú nào được tạo ra cho liên hệ này",
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "Ghi chú"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "thêm một ghi chú"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "Thêm",
+      "PLACEHOLDER": "Thêm ghi chú",
+      "TITLE": "Ấn Shift + Enter để thêm ghi chú"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Xoá ghi chú"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "Hoạt động"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notes",
-      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_NOTES": "ghi chú",
+      "PILL_BUTTON_EVENTS": "sự kiện",
       "PILL_BUTTON_CONVO": "các cuộc hội thoại"
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
-    "BUTTON": "Add custom attribute",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "ADD_BUTTON_TEXT": "Thêm thuộc tính",
+    "BUTTON": "Thêm thuộc tính tùy chỉnh",
+    "NOT_AVAILABLE": "Không có thuộc tính tuỳ chỉnh nào có sẵn cho liên hệ này.",
     "COPY_SUCCESSFUL": "Đã sao chép mã thành công",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "Sao chép thuộc tính",
+      "DELETE": "Xoá thuộc tính",
+      "EDIT": "Sửa thuộc tính"
     },
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Tạo thuộc tính tùy chỉnh",
+      "DESC": "Thêm thông tin tuỳ chỉnh vào liên hệ này."
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "Thêm thuộc tính",
       "CANCEL": "Huỷ",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Tên thuộc tính tùy chỉnh",
+        "PLACEHOLDER": "Ví dụ: shopify id",
+        "ERROR": "Tên thuộc tính tuỳ chỉnh không hợp lệ"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "LABEL": "Giá trị của thuộc tính",
+        "PLACEHOLDER": "Ví dụ: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "TITLE": "Tạo thuộc tính mới ",
+        "SUCCESS": "Thuộc tính được thêm thành công",
+        "ERROR": "Không thể thêm thuộc tính. Vui lòng thử lại sau"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "Thuộc tính cập nhật thành công",
+        "ERROR": "Không thể cập nhật thuộc tính. Vui lòng thử lại sau"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Thuộc tính xoá thành công",
+        "ERROR": "Không thể xoá thuộc tính. Vui lòng thử lại sau"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "Thêm thuộc tính",
+        "PLACEHOLDER": "Tìm kiếm thuộc tính",
+        "NO_RESULT": "Không có thuộc tính nào được tìm thấy"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Chọn giá trị",
+          "SEARCH_INPUT_PLACEHOLDER": "Tìm kiếm giá trị",
+          "NO_RESULT": "Không tìm thấy kết quả"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Giá trị hợp lệ bắt buộc có",
+      "INVALID_URL": "URL không hợp lệ"
     }
   },
   "MERGE_CONTACTS": {
-    "TITLE": "Merge contacts",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "TITLE": "Gộp liên lạc",
+    "DESCRIPTION": "Gộp liên hệ để kết hợp hai hồ sơ thành một, bao gồm tất cả các thuộc tính và cuộc hội thoại. Trong trường hợp xung đột, các thuộc tính của địa chỉ liên hệ Chính sẽ được ưu tiên.",
     "PRIMARY": {
-      "TITLE": "Primary contact",
-      "HELP_LABEL": "To be kept"
+      "TITLE": "Liên lạc chính",
+      "HELP_LABEL": "Được giữ"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "Liên lạc cần gộp",
+      "PLACEHOLDER": "Tìm kiếm liên hệ",
+      "HELP_LABEL": "Sẽ xoá"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+      "TITLE": "Tóm tắt",
+      "DELETE_WARNING": "Liên hệ của <strong>%{childContactName}</strong> sẽ bị xoá.",
+      "ATTRIBUTE_WARNING": "\bChi tiết liên hệ của <strong>%{childContactName}</strong> \bsẽ được sao chép đến <strong>%{primaryContactName}</strong>."
     },
     "SEARCH": {
       "ERROR": "ERROR_MESSAGE"
     },
     "FORM": {
-      "SUBMIT": " Merge contacts",
+      "SUBMIT": " Gộp liên lạc",
       "CANCEL": "Huỷ",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "Chọn liên lạc con để gộp"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "SUCCESS_MESSAGE": "Liên lạc được gộp thành công",
+      "ERROR_MESSAGE": "Không thể gộp liên lạc, thử lại!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/contactFilters.json b/app/javascript/dashboard/i18n/locale/vi/contactFilters.json
index 6193867c4..1ecae25af 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contactFilters.json
@@ -1,45 +1,45 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "TITLE": "Lọc liên hệ",
+        "SUBTITLE": "Thêm bộ lọc bên dưới và ấn 'áp dụng bộ lọc' để lọc liên hệ.",
+        "ADD_NEW_FILTER": "Thêm Bộ lọc",
+        "CLEAR_ALL_FILTERS": "Xoá tất cả bộ lọc",
+        "FILTER_DELETE_ERROR": "Bạn nên có ít nhất 1 bộ lọc để lưu",
         "SUBMIT_BUTTON_LABEL": "Gửi",
         "CANCEL_BUTTON_LABEL": "Huỷ",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "CLEAR_BUTTON_LABEL": "Xoá bộ lọc",
+        "EMPTY_VALUE_ERROR": "Giá trị bắt buộc có",
+        "TOOLTIP_LABEL": "Lọc liên hệ",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "VÀ",
+            "OR": "HOẶC"
         },
         "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
-            "not_equal_to": "Not equal to",
-            "contains": "Contains",
-            "does_not_contain": "Does not contain",
-            "is_present": "Is present",
-            "is_not_present": "Is not present",
-            "is_greater_than": "Is greater than",
-            "is_lesser_than": "Is lesser than"
+            "equal_to": "Bằng",
+            "not_equal_to": "Không bằng",
+            "contains": "Bao gồm",
+            "does_not_contain": "Không bao gồm",
+            "is_present": "Có",
+            "is_not_present": "Không có",
+            "is_greater_than": "Lớn hơn",
+            "is_lesser_than": "Nhỏ hơn"
         },
         "ATTRIBUTES": {
             "NAME": "Tên",
             "EMAIL": "Thư điện tử",
             "PHONE_NUMBER": "Số Điện Thoại",
-            "IDENTIFIER": "Identifier",
-            "CITY": "City",
-            "COUNTRY": "Country",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "IDENTIFIER": "Định danh",
+            "CITY": "Tỉnh / Thành phố",
+            "COUNTRY": "Quốc gia",
+            "CUSTOM_ATTRIBUTE_LIST": "Danh sách",
+            "CUSTOM_ATTRIBUTE_TEXT": "Văn bản",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Số",
+            "CUSTOM_ATTRIBUTE_LINK": "Liên kết",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "Bộ lọc tiêu chuẩn",
+            "ADDITIONAL_FILTERS": "Bộ lọc bổ sung",
             "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index 35c9d0023..c11d7f70c 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -1,41 +1,41 @@
 {
   "CONVERSATION": {
     "404": "Vui lòng chọn một cuộc trò chuyện từ ngăn bên trái",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "UNVERIFIED_SESSION": "Danh tính của người dùng này không được xác thực",
     "NO_MESSAGE_1": "Uh oh! Có vẻ như không có tin nhắn nào từ khách hàng trong hộp thư đến của bạn.",
     "NO_MESSAGE_2": " gửi tin nhắn đến trang của bạn!",
     "NO_INBOX_1": "Hola! Có vẻ như bạn chưa thêm bất kỳ hộp thư đến nào.",
     "NO_INBOX_2": " để bắt đầu",
     "NO_INBOX_AGENT": "Uh Oh! Có vẻ như bạn không thuộc bất kỳ hộp thư đến nào. Vui lòng liên hệ với quản trị viên của bạn",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH_MESSAGES": "Tìm kiếm tin nhắn trong cuộc trò chuyện",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
-      "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "TITLE": "Tìm kiếm tin nhắn",
+      "RESULT_TITLE": "Kết quả tìm kiếm",
+      "LOADING_MESSAGE": "Định dạng dữ liệu...",
+      "PLACEHOLDER": "Nhập để tìm kiếm tin nhắn",
+      "NO_MATCHING_RESULTS": "Không tìm thấy kết quả."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
+    "UNREAD_MESSAGES": "Tin nhắn chưa đọc",
+    "UNREAD_MESSAGE": "Tin nhắn chưa đọc",
     "CLICK_HERE": "Click vào đây",
     "LOADING_INBOXES": "Đang tải hộp thư đến",
     "LOADING_CONVERSATIONS": "Đang tải cuộc trò chuyện",
     "CANNOT_REPLY": "Bạn không thể trả lời do",
     "24_HOURS_WINDOW": "Giới hạn thời lượng tin nhắn 24 giờ",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "NOT_ASSIGNED_TO_YOU": "Cuộc trò chuyện này không được phân công cho bạn. Bạn có muốn phân công cuộc trò chuyện này cho chính mình?",
+    "ASSIGN_TO_ME": "Phân công cho tôi",
+    "TWILIO_WHATSAPP_CAN_REPLY": "Bạn chỉ có thể phản hồi cuộc trò chuyện này dùng tin nhắn mẫu vì",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Giới hạn thời lượng tin nhắn 24 giờ",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "SELECT_A_TWEET_TO_REPLY": "Xin chọn một tweet để trả lời.",
     "REPLYING_TO": "Bạn đang trả lời:",
     "REMOVE_SELECTION": "Xóa lựa chọn",
     "DOWNLOAD": "Tải xuống",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
-    "NO_RESPONSE": "No response",
-    "RATING_TITLE": "Rating",
-    "FEEDBACK_TITLE": "Feedback",
+    "UPLOADING_ATTACHMENTS": "Đang tải đính kèm...",
+    "SUCCESS_DELETE_MESSAGE": "Tin nhắn được xoá thành công",
+    "FAIL_DELETE_MESSSAGE": "Không thể xoá tin nhắn! Thử lại",
+    "NO_RESPONSE": "Không có kết quả trả về",
+    "RATING_TITLE": "Đánh giá",
+    "FEEDBACK_TITLE": "Phản hồi",
     "HEADER": {
       "RESOLVE_ACTION": "Giải quyết",
       "REOPEN_ACTION": "Mở lại",
@@ -43,17 +43,17 @@
       "OPEN": "Nhiều",
       "CLOSE": "Đóng",
       "DETAILS": "chi tiết",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_TOMORROW": "Tạm dừng đến ngày mai",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Tạm dừng đến tuần sau",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Tạm dừng đến khi có phản hồi"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "Đánh dấu chưa giải quyết",
       "SNOOZE": {
-        "TITLE": "Snooze until",
-        "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "TITLE": "Tạm dừng đến khi",
+        "NEXT_REPLY": "Phản hồi kế tiếp",
+        "TOMORROW": "Ngày mai",
+        "NEXT_WEEK": "Tuần sau"
       }
     },
     "FOOTER": {
@@ -66,39 +66,39 @@
       "SEND": "Gửi",
       "CREATE": "Thêm ghi chú",
       "TWEET": "Tweet",
-      "TIP_FORMAT_ICON": "Show rich text editor",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
-      "ENTER_TO_SEND": "Enter to send",
-      "DRAG_DROP": "Drag and drop here to attach",
+      "TIP_FORMAT_ICON": "Hiển thị trình soạn thảo văn bản đa dạng thức",
+      "TIP_EMOJI_ICON": "Hiển thị chọn emoji",
+      "TIP_ATTACH_ICON": "Đính kèm files",
+      "ENTER_TO_SEND": "Nhấn Enter để gửi",
+      "DRAG_DROP": "Kéo thả vào đây để đính kèm",
       "EMAIL_HEAD": {
-        "ADD_BCC": "Add bcc",
+        "ADD_BCC": "Thêm bcc",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "Email tách ra bởi dấu phẩy",
+          "ERROR": "Vui lòng điền địa chỉ email hợp lệ"
         },
         "BCC": {
           "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "Email tách ra bởi dấu phẩy",
+          "ERROR": "Vui lòng điền địa chỉ email hợp lệ"
         }
       }
     },
     "VISIBLE_TO_AGENTS": "Lưu ý riêng: Chỉ hiển thị với bạn và nhóm của bạn",
     "CHANGE_STATUS": "Trạng thái cuộc trò chuyện đã thay đổi",
     "CHANGE_AGENT": "Người Được Chỉ Định Cuộc Hội Thoại đã thay đổi",
-    "CHANGE_TEAM": "Conversation team changed",
-    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
-    "MESSAGE_ERROR": "Unable to send this message, please try again later",
-    "SENT_BY": "Sent by:",
+    "CHANGE_TEAM": "Nhóm của cuộc trò chuyện đã thay đổi",
+    "FILE_SIZE_LIMIT": "File vượt quá kích thước giới hạn {MAXIMUM_FILE_UPLOAD_SIZE}",
+    "MESSAGE_ERROR": "Không thể gửi tin nhắn này, vui lòng thử lại sau",
+    "SENT_BY": "Gửi bởi:",
     "BOT": "Bot",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Không thể gửi tin nhắn! Thử lại",
+    "TRY_AGAIN": "thử lại",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Select Agent",
+      "SELECT_AGENT": "Chọn đại lý",
       "REMOVE": "Xoá",
-      "ASSIGN": "Assign"
+      "ASSIGN": "Phân công"
     },
     "CONTEXT_MENU": {
       "COPY": "Sao Chép",
@@ -114,7 +114,7 @@
     "SEND_EMAIL_ERROR": "Có lỗi, xin vui lòng thử lại",
     "FORM": {
       "SEND_TO_CONTACT": "Gửi bảng điểm cho khách hàng",
-      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
+      "SEND_TO_AGENT": "Gửi bản ghi cho người đại lý được phân công",
       "SEND_TO_OTHER_EMAIL_ADDRESS": "Gửi bản ghi tới một địa chỉ email khác",
       "EMAIL": {
         "PLACEHOLDER": "Nhập địa chỉ emai",
@@ -123,70 +123,71 @@
     }
   },
   "ONBOARDING": {
-    "TITLE": "Hey 👋, Welcome to %{installationName}!",
-    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
-    "READ_LATEST_UPDATES": "Read our latest updates",
+    "TITLE": "Xin chào 👋, Chào mừng đến với %{installationName}!",
+    "DESCRIPTION": "Cảm ơn bạn đã đăng ký. Chúng tôi muốn bạn khai thác tối đa %{installationName}. Dưới đây là một số điều bạn có thể làm trong %{installationName} để mang lại trải nghiệm thú vị.",
+    "READ_LATEST_UPDATES": "Đọc cập nhật mới nhất của chúng tôi",
     "ALL_CONVERSATION": {
-      "TITLE": "All your conversations in one place",
-      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+      "TITLE": "Tất cả cuộc trò chuyện của bạn ở một nơi",
+      "DESCRIPTION": "Xem tất cả các cuộc trò chuyện từ khách hàng của bạn trong một trang tổng quan duy nhất. Bạn có thể lọc các cuộc trò chuyện theo kênh đến, nhãn và trạng thái."
     },
     "TEAM_MEMBERS": {
-      "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
-      "NEW_LINK": "Click here to invite a team member"
+      "TITLE": "Mời các thành viên trong nhóm của bạn",
+      "DESCRIPTION": "Vì bạn đã sẵn sàng để nói chuyện với khách hàng của mình, hãy mang theo đồng đội để hỗ trợ bạn. Bạn có thể mời đồng đội của mình bằng cách thêm địa chỉ email của họ vào danh sách đại lý.",
+      "NEW_LINK": "Bấm vào đây để mời đồng đội"
     },
     "INBOXES": {
-      "TITLE": "Connect Inboxes",
-      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
-      "NEW_LINK": "Click here to create an inbox"
+      "TITLE": "Kết nối hộp thư đến",
+      "DESCRIPTION": "Kết nối các kênh khác nhau mà qua đó khách hàng sẽ nói chuyện với bạn. Nó có thể là một trang web trò chuyện trực tiếp, trang Facebook hoặc Twitter của bạn hoặc thậm chí là số WhatsApp của bạn.",
+      "NEW_LINK": "Bấm vào đây để tạo hộp thư đến"
     },
     "LABELS": {
-      "TITLE": "Organize conversations with labels",
-      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
-      "NEW_LINK": "Click here to create tags"
+      "TITLE": "Tổ chức cuộc trò chuyện với nhãn",
+      "DESCRIPTION": "Nhãn cung cấp một cách dễ dàng hơn để phân loại cuộc trò chuyện của bạn. Tạo một số nhãn như #support-inquiry, #billing-question, v. v. để bạn có thể sử dụng chúng trong cuộc trò chuyện sau này.",
+      "NEW_LINK": "Bấm vào đây để tạo nhãn"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
-    "TEAM_LABEL": "Assigned Team",
+    "ASSIGNEE_LABEL": "Đại lý được phân công",
+    "SELF_ASSIGN": "Phân công cho tôi",
+    "TEAM_LABEL": "Nhóm được phân công",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "Không có"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
-      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONTACT_DETAILS": "Chi tiết liên hệ",
+      "CONVERSATION_ACTIONS": "Hành động của cuộc trò chuyện",
       "CONVERSATION_LABELS": "Nhãn hội thoại",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONVERSATION_INFO": "Thông tin cuộc trò chuyện",
+      "CONTACT_ATTRIBUTES": "Thuộc tính của liên hệ",
       "PREVIOUS_CONVERSATION": "Cuộc trò chuyện trước đó"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Tạo thuộc tính",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Thuộc tính cập nhật thành công",
+      "ERROR": "Không thể cập nhật thuộc tính. Vui lòng thử lại sau"
     },
     "ADD": {
-      "TITLE": "Add",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "TITLE": "Thêm",
+      "SUCCESS": "Thuộc tính được thêm thành công",
+      "ERROR": "Không thể thêm thuộc tính. Vui lòng thử lại sau"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Thuộc tính xoá thành công",
+      "ERROR": "Không thể xoá thuộc tính. Vui lòng thử lại sau"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "Thêm thuộc tính",
+      "PLACEHOLDER": "Tìm kiếm thuộc tính",
+      "NO_RESULT": "Không có thuộc tính nào được tìm thấy"
     }
   },
   "EMAIL_HEADER": {
-    "TO": "To",
+    "FROM": "From",
+    "TO": "Đến",
     "BCC": "Bcc",
     "CC": "Cc",
-    "SUBJECT": "Subject"
+    "SUBJECT": "Chủ đề"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/csatMgmt.json b/app/javascript/dashboard/i18n/locale/vi/csatMgmt.json
index d7d2efc2a..1f2baa7dd 100644
--- a/app/javascript/dashboard/i18n/locale/vi/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/csatMgmt.json
@@ -1,6 +1,6 @@
 {
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Đánh giá cuộc trò chuyện",
+    "PLACEHOLDER": "Cho chúng tôi biết thêm..."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index af30a871f..8780bb745 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -14,8 +14,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "ID Tài khoản",
+        "NOTE": "ID này là bắt buộc nếu bạn đang xây dựng tích hợp dựa trên API"
       },
       "NAME": {
         "LABEL": "Tên tài khoản",
@@ -38,94 +38,94 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Số ngày sau đó mà vé sẽ tự động giải quyết nếu không có hoạt động nào",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Vui lòng điền thời lượng tự động giải quyết hợp lệ (tối thiểu 1 ngày và tối đa 999 ngày)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Tính liên tục của cuộc trò chuyện với email được kích hoạt cho tài khoản của bạn.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Bạn có thể nhận email trong miền tùy chỉnh của mình ngay bây giờ."
       }
     },
-    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance."
+    "UPDATE_CHATWOOT": "Đã có bản cập nhật %{latestChatwootVersion} cho Chatwoot. Vui lòng cập nhật phiên bản của bạn."
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one"
+      "ENTER_TO_SELECT": "Bấm enter để chọn",
+      "ENTER_TO_REMOVE": "Bấm enter để xoá",
+      "SELECT_ONE": "Chọn một"
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
+    "HEADER": "Thông báo",
+    "MARK_ALL_DONE": "Đánh dấu tất cả đã xong",
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Đang tải thông báo...",
+      "404": "Không có thông báo",
       "TABLE_HEADER": [
         "Tên",
         "Số điện thoại",
         "Các cuộc hội thoại",
-        "Last Contacted"
+        "Liên hệ lần cuối"
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_creation": "Tạo mới cuộc trò chuyện",
+      "conversation_assignment": "Cuộc trò chuyện được phân công",
+      "assigned_conversation_new_message": "Tin nhắn mới",
+      "conversation_mention": "Nhắn đến"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "Disconnected from Chatwoot"
+      "TEXT": "Đã ngắt kết nối khỏi Chatwoot"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "Làm mới"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "Tìm kiếm hoặc nhảy đến",
     "SECTIONS": {
-      "GENERAL": "General",
+      "GENERAL": "Chung",
       "REPORTS": "Báo cáo",
-      "CONVERSATION": "Conversation",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
+      "CONVERSATION": "Cuộc trò chuyện",
+      "CHANGE_ASSIGNEE": "Thay đổi người được phân công",
+      "CHANGE_TEAM": "Thay đổi nhóm",
+      "ADD_LABEL": "Thêm nhãn vào cuộc trò chuyện",
+      "REMOVE_LABEL": "Xoá nhãn khỏi cuộc trò chuyện",
       "SETTINGS": "Cài đặt"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
-      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
-      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
-      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
-      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
-      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
-      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
-      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
-      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
-      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
-      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
-      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
-      "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow"
+      "GO_TO_CONVERSATION_DASHBOARD": "Đi tới Trang tổng quan cuộc trò chuyện",
+      "GO_TO_CONTACTS_DASHBOARD": "Đi tới Trang tổng quan liên hệ",
+      "GO_TO_REPORTS_OVERVIEW": "Đi đến Tổng quan Báo cáo",
+      "GO_TO_AGENT_REPORTS": "Đi đến Báo cáo Đại lý",
+      "GO_TO_LABEL_REPORTS": "Đi đến Báo cáo Nhãn",
+      "GO_TO_INBOX_REPORTS": "Đi đến Báo cáo Hộp thư đến",
+      "GO_TO_TEAM_REPORTS": "Đi đến Báo cáo Nhóm",
+      "GO_TO_SETTINGS_AGENTS": "Đi đến Cài đặt Đại lý",
+      "GO_TO_SETTINGS_TEAMS": "Đi đến Cài đặt Nhóm",
+      "GO_TO_SETTINGS_INBOXES": "Đi đến Cài đặt Hộp thư đến",
+      "GO_TO_SETTINGS_LABELS": "Đi đến Cài đặt Nhãn",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Đi đến Cài đặt Thư mẫu phản hồi",
+      "GO_TO_SETTINGS_APPLICATIONS": "Đi đến Cài đặt Ứng dụng",
+      "GO_TO_SETTINGS_ACCOUNT": "Đi đến Cài đặt Tài khoản",
+      "GO_TO_SETTINGS_PROFILE": "Đi đến Cài đặt Hồ sơ",
+      "GO_TO_NOTIFICATIONS": "Đi đến Thông báo",
+      "ADD_LABELS_TO_CONVERSATION": "Thêm nhãn vào cuộc trò chuyện",
+      "ASSIGN_AN_AGENT": "Phân công một đại lý",
+      "ASSIGN_A_TEAM": "Phân công một nhóm",
+      "MUTE_CONVERSATION": "Tắt tiếng",
+      "UNMUTE_CONVERSATION": "Bật tiếng cuộc trò chuyện",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Xoá nhãn khỏi cuộc trò chuyện",
+      "REOPEN_CONVERSATION": "Mở lại cuộc trò chuyện",
+      "RESOLVE_CONVERSATION": "Giải quyết cuộc trò chuyện",
+      "SEND_TRANSCRIPT": "Gửi bản ghi email",
+      "SNOOZE_CONVERSATION": "Tạm dừng Cuộc trò chuyện",
+      "UNTIL_NEXT_REPLY": "Cho đến phản hồi kế tiếp",
+      "UNTIL_NEXT_WEEK": "Cho đến tuần sau",
+      "UNTIL_TOMORROW": "Cho đến ngày mai"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 6d456bfb5..cac60c956 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -30,7 +30,7 @@
     "ADD": {
       "CHANNEL_NAME": {
         "LABEL": "Tên hộp thư đến",
-        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+        "PLACEHOLDER": "Nhập tên hộp thư đến của bạn (ví dụ: Acme Inc)"
       },
       "WEBSITE_NAME": {
         "LABEL": "Tên trang web",
@@ -47,9 +47,9 @@
       },
       "TWITTER": {
         "HELP": "Để thêm hồ sơ Twitter của bạn làm kênh, bạn cần xác thực Hồ sơ Twitter của mình bằng cách nhấp vào 'Đăng nhập bằng Twitter",
-        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "ERROR_MESSAGE": "Đã xảy ra lỗi khi kết nối đến Twitter, vui lòng thử lại",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Tạo cuộc trò chuyện từ các dòng Tweet được nhắn đến"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -61,7 +61,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Điền Webhook URL",
           "ERROR": "Vui lòng nhập một URL hợp lệ"
         },
         "CHANNEL_DOMAIN": {
@@ -82,16 +82,16 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Bật lời chào kênh",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "Gửi tin nhắn chào mừng đến người dùng khi họ bắt đầu cuộc trò chuyện.",
           "ENABLED": "Bật",
           "DISABLED": "Không bật"
         },
         "REPLY_TIME": {
-          "TITLE": "Set Reply time",
-          "IN_A_FEW_MINUTES": "In a few minutes",
-          "IN_A_FEW_HOURS": "In a few hours",
-          "IN_A_DAY": "In a day",
-          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+          "TITLE": "Đặt thời gian phản hồi",
+          "IN_A_FEW_MINUTES": "Trong một vài phút",
+          "IN_A_FEW_HOURS": "Trong một vài giờ",
+          "IN_A_DAY": "Trong một ngày",
+          "HELP_TEXT": "Thời gian trả lời này sẽ được hiển thị trên tiện ích trò chuyện trực tiếp"
         },
         "WIDGET_COLOR": {
           "LABEL": "Màu tiện ích",
@@ -100,8 +100,8 @@
         "SUBMIT_BUTTON": "Tạo hộp thư đến"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Kênh Twilio SMS/WhatsApp",
+        "DESC": "Tích hợp Twilio và bắt đầu hỗ trợ khách hàng của bạn qua SMS hoặc WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "Tài khoản SID",
           "PLACEHOLDER": "Vui lòng nhập SID tài khoản Twilio của bạn",
@@ -112,13 +112,13 @@
           "ERROR": "Vui lòng chọn loại kênh của bạn"
         },
         "AUTH_TOKEN": {
-          "LABEL": "Auth Token",
+          "LABEL": "Token xác thực",
           "PLACEHOLDER": "Vui lòng nhập Twilio Auth Token",
           "ERROR": "Trường này là bắt buộc"
         },
         "CHANNEL_NAME": {
           "LABEL": "Tên hộp thư đến",
-          "PLACEHOLDER": "Please enter a inbox name",
+          "PLACEHOLDER": "Vui lòng điền tên hộp thư đến",
           "ERROR": "Trường này là bắt buộc"
         },
         "PHONE_NUMBER": {
@@ -127,7 +127,7 @@
           "ERROR": "Vui lòng nhập một giá trị hợp lệ. Số điện thoại phải bắt đầu bằng `+`."
         },
         "API_CALLBACK": {
-          "TITLE": "Callback URL",
+          "TITLE": "URL gọi lại",
           "SUBTITLE": "Bạn phải định cấu hình URL gọi lại tin nhắn trong Twilio với URL được đề cập ở đây."
         },
         "SUBMIT_BUTTON": "Tạo kênh Twilio",
@@ -136,40 +136,40 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "Kênh SMS",
+        "DESC": "Bắt đầu hỗ trợ khách hàng thông qua SMS.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Nhà cung cấp API",
           "TWILIO": "Twilio",
           "BANDWIDTH": "Bandwidth"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "Chúng tôi không thể lưu kênh SMS"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "LABEL": "ID Tài khoản",
+            "PLACEHOLDER": "Vui lòng nhập ID Tài khoản Bandwidth",
             "ERROR": "Trường này là bắt buộc"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "Khoá API",
+            "PLACEHOLDER": "Vui lòng nhập Khoá API Bandwidth",
             "ERROR": "Trường này là bắt buộc"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "LABEL": "Bí mật API",
+            "PLACEHOLDER": "Vui lòng nhập \bBí mật API Bandwidth",
             "ERROR": "Trường này là bắt buộc"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "LABEL": "ID ứng dụng",
+            "PLACEHOLDER": "Vui lòng nhập ID Ứng dụng Bandwidth",
             "ERROR": "Trường này là bắt buộc"
           },
           "INBOX_NAME": {
             "LABEL": "Tên hộp thư đến",
-            "PLACEHOLDER": "Please enter a inbox name",
+            "PLACEHOLDER": "Vui lòng điền tên hộp thư đến",
             "ERROR": "Trường này là bắt buộc"
           },
           "PHONE_NUMBER": {
@@ -177,27 +177,27 @@
             "PLACEHOLDER": "Vui lòng nhập số điện thoại mà tin nhắn sẽ được gửi.",
             "ERROR": "Vui lòng nhập một giá trị hợp lệ. Số điện thoại phải bắt đầu bằng `+`."
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "Tạo kênh Bandwidth",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "Chúng tôi không thể xác thực \bchứng chỉ Bandwidth, vui lòng thử lại"
           },
           "API_CALLBACK": {
-            "TITLE": "Callback URL",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "TITLE": "URL gọi lại",
+            "SUBTITLE": "Bạn phải cấu hình tin nhắn URL gọi lại trong Bandwith với URL được đề cập ở đây."
           }
         }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
-        "DESC": "Start supporting your customers via WhatsApp.",
+        "TITLE": "Kênh WhatsApp",
+        "DESC": "Bắt đầu hỗ trợ khách hàng thông qua \bWhatsApp.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Nhà cung cấp API",
           "TWILIO": "Twilio",
           "360_DIALOG": "360Dialog"
         },
         "INBOX_NAME": {
           "LABEL": "Tên hộp thư đến",
-          "PLACEHOLDER": "Please enter an inbox name",
+          "PLACEHOLDER": "Vui lòng điền tên hộp thư đến",
           "ERROR": "Trường này là bắt buộc"
         },
         "PHONE_NUMBER": {
@@ -206,15 +206,15 @@
           "ERROR": "Vui lòng nhập một giá trị hợp lệ. Số điện thoại phải bắt đầu bằng `+`."
         },
         "API_KEY": {
-          "LABEL": "API key",
-          "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
-          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "Khoá API",
+          "SUBTITLE": "Cấu hình Khoá API WhatsApp.",
+          "PLACEHOLDER": "Khoá API",
+          "APPLY_FOR_ACCESS": "Không có khoá API? Đăng ký quyền truy cập ở đây",
+          "ERROR": "Vui lòng điền giá trị hợp lệ."
         },
-        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "SUBMIT_BUTTON": "Tạo kênh WhatsApp",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+          "ERROR_MESSAGE": "Chúng tôi không thể lưu kênh WhatsApp"
         }
       },
       "API_CHANNEL": {
@@ -244,9 +244,9 @@
           "ERROR": "Trường này là bắt buộc"
         },
         "EMAIL": {
-          "LABEL": "Thư điện tử",
+          "LABEL": "Email",
           "SUBTITLE": "Email nơi khách hàng của bạn gửi cho bạn vé hỗ trợ",
-          "PLACEHOLDER": "Thư điện tử"
+          "PLACEHOLDER": "Email"
         },
         "SUBMIT_BUTTON": "Tạo kênh Email",
         "API": {
@@ -255,63 +255,63 @@
         "FINISH_MESSAGE": "Bắt đầu chuyển tiếp email của bạn tới địa chỉ email sau."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
-        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "TITLE": "Kênh LINE",
+        "DESC": "Tích hợp với kênh LINE và bắt đầu hỗ trợ khách hàng của bạn.",
         "CHANNEL_NAME": {
           "LABEL": "Tên Kênh",
           "PLACEHOLDER": "Vui lòng nhập tên kênh",
           "ERROR": "Trường này là bắt buộc"
         },
         "LINE_CHANNEL_ID": {
-          "LABEL": "LINE Channel ID",
-          "PLACEHOLDER": "LINE Channel ID"
+          "LABEL": "ID Kênh LINE",
+          "PLACEHOLDER": "ID Kênh LINE"
         },
         "LINE_CHANNEL_SECRET": {
-          "LABEL": "LINE Channel Secret",
-          "PLACEHOLDER": "LINE Channel Secret"
+          "LABEL": "Bí mật Kênh LINE",
+          "PLACEHOLDER": "Bí mật Kênh LINE"
         },
         "LINE_CHANNEL_TOKEN": {
-          "LABEL": "LINE Channel Token",
-          "PLACEHOLDER": "LINE Channel Token"
+          "LABEL": "Token Kênh LINE",
+          "PLACEHOLDER": "Token Kênh LINE"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "Tạo Kênh LINE",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+          "ERROR_MESSAGE": "Chúng tôi không thể lưu kênh LINE"
         },
         "API_CALLBACK": {
-          "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+          "TITLE": "URL gọi lại",
+          "SUBTITLE": "Bạn phải cấu hình webhook URL trong ứng dụng LINE với URL được nhắc đến ở đây."
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
-        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "TITLE": "Kênh Telegram",
+        "DESC": "Tích hợp với kênh Telegram và bắt đầu hỗ trợ khách hàng của bạn.",
         "BOT_TOKEN": {
-          "LABEL": "Bot Token",
-          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
-          "PLACEHOLDER": "Bot Token"
+          "LABEL": "Token Bot",
+          "SUBTITLE": "Cấu hình token bot mà bạn đã nhận được từ Telegram BotFather.",
+          "PLACEHOLDER": "Token Bot"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "Tạo Kênh Telegram",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "Chúng tôi không thể lưu kênh \btelegram"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+        "TITLE": "Chọn kênh",
+        "DESC": "Chatwoot hỗ trợ tiện ích trò chuyện trực tiếp, trang Facebook, hồ sơ Twitter, WhatsApp, Email, v. v., dưới dạng các kênh. Nếu bạn muốn xây dựng một kênh tùy chỉnh, bạn có thể tạo bằng cách sử dụng kênh API. Chọn một kênh từ các tùy chọn bên dưới để tiếp tục."
       },
       "AGENTS": {
         "TITLE": "Nhà Cung Cấp",
         "DESC": "Tại đây bạn có thể thêm các tác nhân để quản lý hộp thư đến mới tạo của mình. Chỉ những đại lý được chọn này mới có quyền truy cập vào hộp thư đến của bạn. Các nhân viên không thuộc hộp thư đến này sẽ không thể xem hoặc trả lời thư trong hộp thư đến này khi họ đăng nhập. <br> <b>PS:</b> Với tư cách là quản trị viên, nếu bạn cần quyền truy cập vào tất cả các hộp thư đến, bạn nên thêm mình làm đại lý cho tất cả các hộp thư đến mà bạn tạo.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
-        "PICK_AGENTS": "Pick agents for the inbox"
+        "VALIDATION_ERROR": "Thêm ít nhất một đại lý vào hộp thư đến mới của bạn",
+        "PICK_AGENTS": "Chọn đại lý cho hộp thư đến"
       },
       "DETAILS": {
         "TITLE": "Chi tiết Hộp thư đến",
         "DESC": "Từ menu thả xuống bên dưới, chọn Trang Facebook bạn muốn kết nối với Chatwoot. Bạn cũng có thể đặt tên tùy chỉnh cho hộp thư đến của mình để nhận dạng tốt hơn."
       },
       "FINISH": {
-        "TITLE": "Nailed It!",
+        "TITLE": "Đúng rồi!",
         "DESC": "Bạn đã tích hợp thành công Trang Facebook của mình với Chatwoot. Lần tới khi khách hàng nhắn tin cho Trang của bạn, cuộc trò chuyện sẽ tự động xuất hiện trong hộp thư đến của bạn.<br>Chúng tôi cũng đang cung cấp cho bạn tập lệnh widget mà bạn có thể dễ dàng thêm vào trang web của mình. Khi điều này xuất hiện trên trang web của bạn, khách hàng có thể nhắn tin cho bạn ngay từ trang web của bạn mà không cần sự trợ giúp của bất kỳ công cụ bên ngoài nào và cuộc trò chuyện sẽ xuất hiện ngay tại đây, trên Chatwoot.<br>Cool, huh? Well :)"
       }
     },
@@ -330,7 +330,7 @@
       "TITLE": "Hộp thư đến của bạn đã sẵn sàng!",
       "MESSAGE": "Giờ đây, bạn có thể tương tác với khách hàng thông qua Kênh mới của mình. Chúc vui vẻ ủng hộ ",
       "BUTTON_TEXT": "Đưa cho tôi",
-      "MORE_SETTINGS": "More settings",
+      "MORE_SETTINGS": "Nhiều tuỳ chọn hơn",
       "WEBSITE_SUCCESS": "Bạn đã hoàn thành việc tạo kênh trang web thành công. Sao chép mã được hiển thị bên dưới và dán vào trang web của bạn. Lần tới khi khách hàng sử dụng cuộc trò chuyện trực tiếp, cuộc trò chuyện sẽ tự động xuất hiện trong hộp thư đến của bạn."
     },
     "REAUTH": "Ủy quyền lại",
@@ -362,33 +362,33 @@
         "DISABLED": "Không bật"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "Bật"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Xoá",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Xoá hình đại diện",
       "CONFIRM": {
         "TITLE": "Xác nhận xoá",
         "MESSAGE": "Bạn có muốn xoá? ",
-        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "PLACE_HOLDER": "Vui lòng điền {inboxName} để xác nhận",
         "YES": "Có, Xoá ",
         "NO": "Không, Giữ "
       },
       "API": {
         "SUCCESS_MESSAGE": "Hộp thư đến đã được xóa thành công",
         "ERROR_MESSAGE": "Không thể xóa hộp thư đến. Vui lòng thử lại sau.",
-        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
-        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+        "AVATAR_SUCCESS_MESSAGE": "Hình đại diện của hộp thư đến đã được xoá thành công",
+        "AVATAR_ERROR_MESSAGE": "Không thể xoá hình đại diện của hộp thư đến. Vui lòng thử lại sau."
       }
     },
     "TABS": {
       "SETTINGS": "Cài đặt",
       "COLLABORATORS": "Cộng tác viên",
       "CONFIGURATION": "Cấu hình",
-      "CAMPAIGN": "Campaigns",
-      "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "CAMPAIGN": "Chiến dịch",
+      "PRE_CHAT_FORM": "Biểu mẫu trước khi trò chuyện",
+      "BUSINESS_HOURS": "Giờ làm việc"
     },
     "SETTINGS": "Cài đặt",
     "FEATURES": {
@@ -402,81 +402,81 @@
       "INBOX_AGENTS": "Nhà cung cấp",
       "INBOX_AGENTS_SUB_TEXT": "Thêm hoặc xóa tác nhân khỏi hộp thư đến này",
       "UPDATE": "Cập nhật",
-      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "ENABLE_EMAIL_COLLECT_BOX": "Bật hộp thu thập email",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Bật hoặc tắt hộp thu thập email trên cuộc trò chuyện mới",
       "AUTO_ASSIGNMENT": "Bật tự động chuyển nhượng",
-      "ENABLE_CSAT": "Enable CSAT",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
-      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "ENABLE_CSAT": "Bật CSAT",
+      "ENABLE_CSAT_SUB_TEXT": "Bật / Tắt khảo sát CSAT (Mức độ hài lòng của khách hàng) sau khi giải quyết cuộc trò chuyện",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Bật tiếp tục cuộc trò chuyện qua email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Cuộc trò chuyện sẽ tiếp tục qua email nếu có địa chỉ email liên lạc.",
       "INBOX_UPDATE_TITLE": "Cài đặt Hộp thư đến",
       "INBOX_UPDATE_SUB_TEXT": "Cập nhật cài đặt hộp thư đến của bạn",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bật hoặc tắt tính năng tự động gán các cuộc hội thoại mới cho các tác nhân được thêm vào hộp thư đến này.",
-      "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
-      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
+      "HMAC_VERIFICATION": "Xác thực danh tính người dùng",
+      "HMAC_DESCRIPTION": "Để xác thực danh tính của người dùng, SDK cho phép bạn gửi thêm `identifier_hash` cho mỗi người dùng. Bạn có thể tạo HMAC bằng cách sử dụng 'sha256' với khóa được hiển thị ở đây.",
+      "HMAC_MANDATORY_VERIFICATION": "Bắt buộc Xác thực danh tính người dùng",
+      "HMAC_MANDATORY_DESCRIPTION": "Nếu được bật, phương thức SetUser của Chatwoot SDKs sẽ không hoạt động trừ khi `identifier_hash` được cung cấp cho mỗi người dùng.",
+      "INBOX_IDENTIFIER": "Định danh hộp thư đến",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Dùng token định danh hộp thư đến hiện ở đây để xác thực các ứng dụng khách API của bạn.",
+      "FORWARD_EMAIL_TITLE": "Chuyển tiếp đến Email",
       "FORWARD_EMAIL_SUB_TEXT": "Bắt đầu chuyển tiếp email của bạn tới địa chỉ email sau.",
-      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Cho phép nhắn tin sau khi cuộc trò chuyện được giải quyết",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Cho phép người dùng cuối nhắn tin sau khi cuộc trò chuyện được giải quyết."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Ủy quyền lại",
-      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
-      "MESSAGE_SUCCESS": "Reconnection successful",
+      "SUBTITLE": "Kết nối Facebook của bạn đã hết hạn, vui lòng kết nối lại trang Facebook của bạn để tiếp tục dịch vụ",
+      "MESSAGE_SUCCESS": "Kết nối lại thành công",
       "MESSAGE_ERROR": "Đã có lỗi, vui lòng thử lại"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "DESCRIPTION": "Biểu mẫu trước khi trò chuyện cho phép bạn nắm bắt thông tin người dùng trước khi họ bắt đầu cuộc trò chuyện với bạn.",
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "Bật biểu mẫu trước khi trò chuyện",
         "OPTIONS": {
-          "ENABLED": "Yes",
-          "DISABLED": "No"
+          "ENABLED": "Có",
+          "DISABLED": "Không"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "Tin nhắn trước khi trò chuyện",
+        "PLACEHOLDER": "Tin nhắn này sẽ hiện cho những người dùng cùng với biểu mẫu"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "Khách truy cập nên cung cấp tên và địa chỉ email của họ trước khi bắt đầu trò chuyện"
       }
     },
     "BUSINESS_HOURS": {
-      "TITLE": "Set your availability",
-      "SUBTITLE": "Set your availability on your livechat widget",
-      "WEEKLY_TITLE": "Set your weekly hours",
-      "TIMEZONE_LABEL": "Select timezone",
-      "UPDATE": "Update business hours settings",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TITLE": "Đặt tính khả dụng của bạn",
+      "SUBTITLE": "Đặt tính khả dụng của bạn trên tiện ích trò chuyện trực tiếp",
+      "WEEKLY_TITLE": "Đặt giờ hàng tuần của bạn",
+      "TIMEZONE_LABEL": "Chọn múi giờ",
+      "UPDATE": "Cập nhật tuỳ chỉnh giờ làm việc",
+      "TOGGLE_AVAILABILITY": "Kích hoạt tính khả dụng của doanh nghiệp cho hộp thư đến này",
+      "UNAVAILABLE_MESSAGE_LABEL": "Thông báo không có sẵn cho khách truy cập",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "Chúng tôi không có sẵn tại thời điểm này. Để lại tin nhắn, chúng tôi sẽ trả lời khi chúng tôi trở lại.",
+      "TOGGLE_HELP": "Việc kích hoạt tính khả dụng của doanh nghiệp sẽ hiển thị giờ có sẵn trên tiện ích trò chuyện trực tiếp ngay cả khi tất cả các đại lý đều ngoại tuyến. Ngoài giờ có sẵn, khách truy cập có thể được cảnh báo bằng thông điệp và biểu mẫu trò chuyện trước.",
       "DAY": {
-        "ENABLE": "Enable availability for this day",
-        "UNAVAILABLE": "Unavailable",
-        "HOURS": "hours",
-        "VALIDATION_ERROR": "Starting time should be before closing time.",
-        "CHOOSE": "Choose"
+        "ENABLE": "Kích hoạt tính khả dụng cho hôm nay",
+        "UNAVAILABLE": "Không có sẵn",
+        "HOURS": "giờ",
+        "VALIDATION_ERROR": "Giờ bắt đầu nên trước giờ đóng cửa.",
+        "CHOOSE": "Chọn"
       }
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Đặt chi tiết IMAP",
+      "UPDATE": "Cập nhật chi tiết IMAP",
+      "TOGGLE_AVAILABILITY": "Kích hoạt cấu hình IMAP cho hộp thư đến này",
+      "TOGGLE_HELP": "Kích hoạt IMAP sẽ giúp cho người dùng nhận được email",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "Tuỳ chỉnh IMAP được cập nhật thành công",
+        "ERROR_MESSAGE": "Không thể cập nhật tuỳ chỉnh IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Địa chỉ",
+        "PLACE_HOLDER": "Địa chỉ (Ví dụ: imap.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
@@ -490,21 +490,21 @@
         "LABEL": "Mật khẩu",
         "PLACE_HOLDER": "Mật khẩu"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Kích hoạt SSL"
     },
     "SMTP": {
-      "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "TITLE": "STMP",
+      "SUBTITLE": "Đặt chi tiết SMTP",
+      "UPDATE": "Cập nhật tuỳ chỉnh SMTP",
+      "TOGGLE_AVAILABILITY": "Kích hoạt cấu hình SMTP cho hộp thư đến này",
+      "TOGGLE_HELP": "Kích hoạt SMTP sẽ giúp cho người dùng gửi email",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "Tuỳ chỉnh SMTP được cập nhật thành công",
+        "ERROR_MESSAGE": "Không thể cập nhật tuỳ chỉnh SMTP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Địa chỉ",
+        "PLACE_HOLDER": "Địa chỉ (Ví dụ: smtp.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
@@ -519,9 +519,13 @@
         "PLACE_HOLDER": "Mật khẩu"
       },
       "DOMAIN": {
-        "LABEL": "Domain",
-        "PLACE_HOLDER": "Domain"
-      }
+        "LABEL": "Miền",
+        "PLACE_HOLDER": "Miền"
+      },
+      "ENCRYPTION": "Mã hoá",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Mở Chế độ xác minh SSL"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrationApps.json b/app/javascript/dashboard/i18n/locale/vi/integrationApps.json
index d7c0ffe9a..fd207b6e6 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrationApps.json
@@ -1,36 +1,36 @@
 {
   "INTEGRATION_APPS": {
-    "FETCHING": "Fetching Integrations",
-    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
-    "HEADER": "Applications",
+    "FETCHING": "Đang lấy Tích hợp",
+    "NO_HOOK_CONFIGURED": "Không có tích hợp %{integrationId} được cấu hình đối với tài khoản này.",
+    "HEADER": "Ứng dụng",
     "STATUS": {
       "ENABLED": "Bật",
       "DISABLED": "Không bật"
     },
     "CONFIGURE": "Cấu hình",
-    "ADD_BUTTON": "Add a new hook",
+    "ADD_BUTTON": "Thêm một hook mới",
     "DELETE": {
       "TITLE": {
-        "INBOX": "Confirm deletion",
-        "ACCOUNT": "Disconnect"
+        "INBOX": "Xác nhận xoá",
+        "ACCOUNT": "Ngắt kết nối"
       },
       "MESSAGE": {
-        "INBOX": "Are you sure to delete?",
-        "ACCOUNT": "Are you sure to disconnect?"
+        "INBOX": "Bạn có chắc muốn xoá?",
+        "ACCOUNT": "Bạn có chắc muốn ngắt kết nối?"
       },
       "CONFIRM_BUTTON_TEXT": {
         "INBOX": "Có, Xoá",
-        "ACCOUNT": "Yes, Disconnect"
+        "ACCOUNT": "Có, ngắt kết nối"
       },
       "CANCEL_BUTTON_TEXT": "Huỷ",
       "API": {
-        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "SUCCESS_MESSAGE": "Hook đã được xoá thành công",
         "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
       }
     },
     "LIST": {
-      "FETCHING": "Fetching integration hooks",
-      "INBOX": "Inbox",
+      "FETCHING": "Đang lấy hook tích hợp",
+      "INBOX": "Hộp thư đến",
       "DELETE": {
         "BUTTON_TEXT": "Xoá"
       }
@@ -38,14 +38,14 @@
     "ADD": {
       "FORM": {
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox"
+          "LABEL": "Chọn Hộp thư đến",
+          "PLACEHOLDER": "Chọn Hộp thư đến"
         },
         "SUBMIT": "Tạo",
         "CANCEL": "Huỷ"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "SUCCESS_MESSAGE": "Hook tích hợp đã được thêm thành công",
         "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
       }
     },
@@ -53,10 +53,10 @@
       "BUTTON_TEXT": "Kết nối"
     },
     "DISCONNECT": {
-      "BUTTON_TEXT": "Disconnect"
+      "BUTTON_TEXT": "Ngắt kết nối"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+      "DIALOGFLOW": "Dialogflow là một nền tảng hiểu ngôn ngữ tự nhiên giúp bạn dễ dàng thiết kế và tích hợp giao diện người dùng trò chuyện vào ứng dụng di động, ứng dụng web, thiết bị, bot, hệ thống phản hồi giọng nói tương tác, v. v. Tích hợp <br/> <br/> Dialogflow với% %{installationName} cho phép bạn định cấu hình bot Dialogflow với hộp thư đến của bạn, điều này cho phép bot xử lý các truy vấn ban đầu và giao chúng cho đại lý khi cần. Dialogflow có thể được sử dụng để xác định khách hàng tiềm năng, giảm khối lượng công việc của các đại lý bằng cách cung cấp các câu hỏi thường gặp, v. v. <br/> <br/> Để thêm Dialogflow, bạn cần tạo Tài khoản dịch vụ trong bảng điều khiển dự án của Google và chia sẻ chứng chỉ. Vui lòng tham khảo tài liệu Dialogflow để biết thêm thông tin."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index a6237565e..81250e91d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -19,7 +19,7 @@
       },
       "EDIT": {
         "BUTTON_TEXT": "Chỉnh sửa",
-        "TITLE": "Edit webhook",
+        "TITLE": "Sửa webhook",
         "CANCEL": "Huỷ",
         "DESC": "Webhook events cung cấp cho bạn thông tin thời gian thực về những gì đang xảy ra trong tài khoản Chatwoot của bạn. Vui lòng nhập một URL hợp lệ để định cấu hình một cuộc gọi lại.",
         "FORM": {
@@ -28,10 +28,10 @@
             "PLACEHOLDER": "Ví dụ: https://example/api/webhook",
             "ERROR": "Vui lòng nhập một URL hợp lệ"
           },
-          "SUBMIT": "Edit webhook"
+          "SUBMIT": "Sửa webhook"
         },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook URL cập nhật thành công",
           "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
         }
       },
@@ -68,8 +68,8 @@
     },
     "SLACK": {
       "HELP_TEXT": {
-        "TITLE": "Using Slack Integration",
-        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
+        "TITLE": "Dùng tích hợp Slack",
+        "BODY": "<br/><p>Chatwoot giờ đây sẽ đồng bộ hóa tất cả các cuộc trò chuyện đến vào kênh <b><i>cuộc trò chuyện với khách hàng</i></b> bên trong nơi làm việc Slack của bạn.</p><p>Trả lời chuỗi hội thoại trong kênh Slack <b><i>cuộc trò chuyện với khách hàng</i></b> sẽ tạo phản hồi lại cho khách hàng thông qua chatwoot. </p><p>Bắt đầu câu trả lời bằng <b><i>ghi chú:</i></b> để tạo ghi chú riêng tư thay vì trả lời.</p><p>Nếu người trả lời trên slack có hồ sơ đại lý trong chatwoot dưới cùng một email, thì các câu trả lời sẽ được liên kết theo đó.</p><p>Khi người trả lời không có hồ sơ đại lý được liên kết, các câu trả lời sẽ được thực hiện từ hồ sơ bot.</p>"
       }
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
index 5ce6ff50a..7e32a51ff 100644
--- a/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
@@ -19,9 +19,9 @@
       "NAME": {
         "LABEL": "Tên nhãn",
         "PLACEHOLDER": "Tên nhãn",
-        "REQUIRED_ERROR": "Label name is required",
-        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
-        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+        "REQUIRED_ERROR": "Tên nhãn là bắt buộc",
+        "MINIMUM_LENGTH_ERROR": "Bắt buộc độ dài tối thiểu là 2",
+        "VALID_ERROR": "Chỉ cho phép Chữ cái, Chữ số, Dấu gạch ngang và Dấu gạch dưới"
       },
       "DESCRIPTION": {
         "LABEL": "Mô tả",
diff --git a/app/javascript/dashboard/i18n/locale/vi/report.json b/app/javascript/dashboard/i18n/locale/vi/report.json
index 8e3270783..e1f6d47c7 100644
--- a/app/javascript/dashboard/i18n/locale/vi/report.json
+++ b/app/javascript/dashboard/i18n/locale/vi/report.json
@@ -1,9 +1,9 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Tổng quan",
     "LOADING_CHART": "Đang tải các biểu đồ dữ liệu...",
     "NO_ENOUGH_DATA": "Chúng tôi không nhận được đủ điểm dữ liệu để tạo báo cáo, Vui lòng thử lại sau.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "DOWNLOAD_AGENT_REPORTS": "Tải xuống báo cáo đại lý",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Các cuộc trò chuyện",
@@ -41,32 +41,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 tháng vừa qua"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 tháng vừa qua"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Năm ngoái"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Phạm vi ngày tùy chỉnh"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Áp dụng",
+      "PLACEHOLDER": "Chọn phạm vi ngày"
     }
   },
   "AGENT_REPORTS": {
-    "HEADER": "Agents Overview",
+    "HEADER": "Tổng quan đại lý",
     "LOADING_CHART": "Đang tải các biểu đồ dữ liệu...",
     "NO_ENOUGH_DATA": "Chúng tôi không nhận được đủ điểm dữ liệu để tạo báo cáo, Vui lòng thử lại sau.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
-    "FILTER_DROPDOWN_LABEL": "Select Agent",
+    "DOWNLOAD_AGENT_REPORTS": "Tải xuống báo cáo đại lý",
+    "FILTER_DROPDOWN_LABEL": "Chọn đại lý",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Các cuộc hội thoại",
@@ -104,32 +104,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 tháng vừa qua"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 tháng vừa qua"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Năm ngoái"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Phạm vi ngày tùy chỉnh"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Áp dụng",
+      "PLACEHOLDER": "Chọn phạm vi ngày"
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
+    "HEADER": "Tổng quan nhãn",
     "LOADING_CHART": "Đang tải các biểu đồ dữ liệu...",
     "NO_ENOUGH_DATA": "Chúng tôi không nhận được đủ điểm dữ liệu để tạo báo cáo, Vui lòng thử lại sau.",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "DOWNLOAD_LABEL_REPORTS": "Tải xuống báo cáo nhãn",
+    "FILTER_DROPDOWN_LABEL": "Chọn Nhãn",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Các cuộc hội thoại",
@@ -167,32 +167,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 tháng vừa qua"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 tháng vừa qua"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Năm ngoái"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Phạm vi ngày tùy chỉnh"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Áp dụng",
+      "PLACEHOLDER": "Chọn phạm vi ngày"
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
+    "HEADER": "Tổng quan hộp thư đến",
     "LOADING_CHART": "Đang tải các biểu đồ dữ liệu...",
     "NO_ENOUGH_DATA": "Chúng tôi không nhận được đủ điểm dữ liệu để tạo báo cáo, Vui lòng thử lại sau.",
-    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
-    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "DOWNLOAD_INBOX_REPORTS": "Tải xuống báo cáo hộp thư đến",
+    "FILTER_DROPDOWN_LABEL": "Chọn Hộp thư đến",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Các cuộc hội thoại",
@@ -230,32 +230,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 tháng vừa qua"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 tháng vừa qua"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Năm ngoái"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Phạm vi ngày tùy chỉnh"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Áp dụng",
+      "PLACEHOLDER": "Chọn phạm vi ngày"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
+    "HEADER": "Tổng quan nhóm",
     "LOADING_CHART": "Đang tải các biểu đồ dữ liệu...",
     "NO_ENOUGH_DATA": "Chúng tôi không nhận được đủ điểm dữ liệu để tạo báo cáo, Vui lòng thử lại sau.",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "DOWNLOAD_TEAM_REPORTS": "Tải xuống báo cáo nhóm",
+    "FILTER_DROPDOWN_LABEL": "Chọn nhóm",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Các cuộc hội thoại",
@@ -293,49 +293,49 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 tháng vừa qua"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 tháng vừa qua"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Năm ngoái"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Phạm vi ngày tùy chỉnh"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Áp dụng",
+      "PLACEHOLDER": "Chọn phạm vi ngày"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "HEADER": "Báo cáo CSAT",
+    "NO_RECORDS": "Không có phản hồi báo cáo CSAT có sẵn.",
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "CONTACT_NAME": "Liên hệ",
+        "AGENT_NAME": "Đại lý được phân công",
+        "RATING": "Đánh giá",
+        "FEEDBACK_TEXT": "Bình luận phản hồi"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "Tổng số phản hồi",
+        "TOOLTIP": "Tổng số phản hồi thu thập được"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "Mức độ hài lòng",
+        "TOOLTIP": "Tổng số phản hồi tích cực / Tổng số phản hồi * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "Tỷ lệ phản hồi",
+        "TOOLTIP": "Tổng số phản hồi / Tổng số tin nhắn khảo sát CSAT đã gửi * 100"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index e0d950b36..49fb52958 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -3,10 +3,10 @@
     "LINK": "Cài Đặt Hồ Sơ",
     "TITLE": "Cài Đặt Hồ Sơ",
     "BTN_TEXT": "Cập Nhật Hồ Sơ",
-    "DELETE_AVATAR": "Delete Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
-    "UPDATE_SUCCESS": "Your profile has been updated successfully",
+    "DELETE_AVATAR": "Xoá hình đại diện",
+    "AVATAR_DELETE_SUCCESS": "Ảnh đại diện đã được xoá thành công",
+    "AVATAR_DELETE_FAILED": "Đã xảy ra lỗi khi xoá ảnh đại diện, vui lòng thử lại",
+    "UPDATE_SUCCESS": "Hồ sơ của bạn đã được cập nhật thành công",
     "PASSWORD_UPDATE_SUCCESS": "Mật khẩu của bạn đã được thay đổi thành công",
     "AFTER_EMAIL_CHANGED": "Hồ sơ của bạn đã được cập nhật thành công, vui lòng đăng nhập lại khi thông tin đăng nhập của bạn được thay đổi",
     "FORM": {
@@ -22,26 +22,26 @@
       "PASSWORD_SECTION": {
         "TITLE": "Mật khẩu",
         "NOTE": "Cập nhật mật khẩu của bạn sẽ đặt lại thông tin đăng nhập của bạn trên nhiều thiết bị.",
-        "BTN_TEXT": "Change password"
+        "BTN_TEXT": "Thay đổi mật khẩu"
       },
       "ACCESS_TOKEN": {
-        "TITLE": "Access Token",
+        "TITLE": "Token truy cập",
         "NOTE": "Có thể sử dụng Token này nếu bạn đang xây dựng tích hợp dựa trên API"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
-        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
-        "NONE": "None",
-        "ASSIGNED": "Assigned Conversations",
-        "ALL_CONVERSATIONS": "All Conversations"
+        "TITLE": "Âm thanh Thông báo",
+        "NOTE": "Bật âm thanh thông báo trong trang tổng quan cho các tin nhắn và cuộc trò chuyện mới.",
+        "NONE": "Không có",
+        "ASSIGNED": "Cuộc trò chuyện được phân công",
+        "ALL_CONVERSATIONS": "Tất cả cuộc trò chuyện"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Thông Báo Email",
         "NOTE": "Cập nhật tùy chọn thông báo qua email của bạn tại đây",
         "CONVERSATION_ASSIGNMENT": "Gửi thông báo qua email khi cuộc trò chuyện được chỉ định cho tôi",
         "CONVERSATION_CREATION": "Gửi thông báo qua email khi cuộc trò chuyện mới được tạo",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+        "CONVERSATION_MENTION": "Gửi thông báo email khi bạn được nhắc đến trong 1 cuộc trò chuyện",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Gửi thông báo email khi có một tin nhắn mới được tạo trong cuộc trò chuyện được phân công"
       },
       "API": {
         "UPDATE_SUCCESS": "Tùy chọn thông báo của bạn đã được cập nhật thành công",
@@ -52,8 +52,8 @@
         "NOTE": "Cập nhật tùy chọn thông báo của bạn tại đây",
         "CONVERSATION_ASSIGNMENT": "Gửi thông báo khi cuộc trò chuyện được chỉ định cho tôi",
         "CONVERSATION_CREATION": "Gửi thông báo khi cuộc trò chuyện mới được tạo",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "CONVERSATION_MENTION": "Gửi thông báo đẩy khi bạn được nhắc đến trong 1 cuộc trò chuyện",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Gửi thông báo đẩy khi có một tin nhắn mới được tạo trong cuộc trò chuyện được phân công",
         "HAS_ENABLED_PUSH": "Bạn đã bật tính năng thông báo cho trình duyệt này.",
         "REQUEST_PUSH": "Bật thông báo"
       },
@@ -84,35 +84,35 @@
         "PLACEHOLDER": "Vui lòng nhập địa chỉ email của bạn, địa chỉ này sẽ được hiển thị trong các cuộc trò chuyện"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
-        "ERROR": "Please enter the current password",
-        "PLACEHOLDER": "Please enter the current password"
+        "LABEL": "Mật khẩu hiện tại",
+        "ERROR": "Vui lòng nhập mật khẩu hiện tại",
+        "PLACEHOLDER": "Vui lòng nhập mật khẩu hiện tại"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "Mật khẩu mới",
         "ERROR": "Vui lòng nhập mật khẩu có độ dài từ 6 trở lên",
         "PLACEHOLDER": "Vui lòng nhập mật khẩu mới"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Xác nhận mật khẩu mới",
         "ERROR": "Xác nhận mật khẩu phải khớp với mật khẩu",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "PLACEHOLDER": "Vui lòng nhập lại mật khẩu \bmới"
       }
     }
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Đổi",
     "CHANGE_ACCOUNTS": "Chuyển tài khoản",
-    "CONTACT_SUPPORT": "Contact Support",
+    "CONTACT_SUPPORT": "Liên hệ Hỗ trợ",
     "SELECTOR_SUBTITLE": "Chọn một tài khoản từ danh sách sau",
     "PROFILE_SETTINGS": "Cài Đặt Hồ Sơ Cá Nhân",
-    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "KEYBOARD_SHORTCUTS": "Phím tắt",
     "LOGOUT": "Đăng xuất"
   },
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "ngày dùng thử còn lại.",
     "TRAIL_BUTTON": "Mua Ngay",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Người dùng bị xoá"
   },
   "COMPONENTS": {
     "CODE": {
@@ -135,44 +135,44 @@
   },
   "SIDEBAR": {
     "CONVERSATIONS": "Cuộc trò chuyện",
-    "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "ALL_CONVERSATIONS": "Tất cả cuộc trò chuyện",
+    "MENTIONED_CONVERSATIONS": "Nhắn đến",
     "REPORTS": "Báo cáo",
     "SETTINGS": "Cài Đặt",
-    "CONTACTS": "Contacts",
+    "CONTACTS": "Liên hệ",
     "HOME": "Trang Chủ",
     "AGENTS": "Đại lý",
     "INBOXES": "Hộp thư đến",
-    "NOTIFICATIONS": "Notifications",
+    "NOTIFICATIONS": "Thông báo",
     "CANNED_RESPONSES": "Thư mẫu phẩn hồi",
     "INTEGRATIONS": "Tích hợp",
     "PROFILE_SETTINGS": "Cài Đặt Hồ Sơ",
     "ACCOUNT_SETTINGS": "Cài Đặt Tài Khoản",
-    "APPLICATIONS": "Applications",
+    "APPLICATIONS": "Ứng dụng",
     "LABELS": "Nhãn",
     "CUSTOM_ATTRIBUTES": "Thuộc tính tùy chỉnh",
-    "AUTOMATION": "Automation",
+    "AUTOMATION": "Tự động hoá",
     "TEAMS": "Nhóm",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
-    "CUSTOM_VIEWS_SEGMENTS": "Segments",
-    "ALL_CONTACTS": "All Contacts",
-    "TAGGED_WITH": "Tagged with",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "CUSTOM_VIEWS_FOLDER": "Thư mục",
+    "CUSTOM_VIEWS_SEGMENTS": "Phân khúc",
+    "ALL_CONTACTS": "Tất cả liên lạc",
+    "TAGGED_WITH": "Được gắn thẻ với",
+    "NEW_LABEL": "Nhãn mới",
+    "NEW_TEAM": "Nhóm mới",
+    "NEW_INBOX": "Hộp thư đến mới",
+    "REPORTS_OVERVIEW": "Tổng quan",
     "CSAT": "CSAT",
-    "CAMPAIGNS": "Campaigns",
-    "ONGOING": "Ongoing",
-    "ONE_OFF": "One off",
+    "CAMPAIGNS": "Chiến dịch",
+    "ONGOING": "Đang diễn ra",
+    "ONE_OFF": "Một lần",
     "REPORTS_AGENT": "Nhà cung cấp",
     "REPORTS_LABEL": "Nhãn",
-    "REPORTS_INBOX": "Inbox",
-    "REPORTS_TEAM": "Team",
-    "SET_AVAILABILITY_TITLE": "Set yourself as"
+    "REPORTS_INBOX": "Hộp thư đến",
+    "REPORTS_TEAM": "Nhóm",
+    "SET_AVAILABILITY_TITLE": "Đặt chính mình như"
   },
   "CREATE_ACCOUNT": {
-    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
+    "NO_ACCOUNT_WARNING": "Ồ ồ! Chúng tôi không thể tìm thấy bất kỳ tài khoản Chatwoot nào. Vui lòng tạo một tài khoản mới để tiếp tục.",
     "NEW_ACCOUNT": "Tạo mới tài khoản",
     "SELECTOR_SUBTITLE": "Tạo mới một tài khoản",
     "API": {
@@ -190,22 +190,22 @@
   },
   "KEYBOARD_SHORTCUTS": {
     "TITLE": {
-      "OPEN_CONVERSATION": "Open conversation",
-      "RESOLVE_AND_NEXT": "Resolve and move to next",
-      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
-      "RESOLVE_CONVERSATION": "Resolve Conversation",
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "ADD_ATTACHMENT": "Add Attachment",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "TOGGLE_SIDEBAR": "Toggle Sidebar",
-      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
-      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
-      "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
-      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
-      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
-      "SWITCH_TO_REPLY": "Switch to Reply",
-      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+      "OPEN_CONVERSATION": "Mở cuộc trò chuyện",
+      "RESOLVE_AND_NEXT": "Giải quyết và đi đến cái tiếp theo",
+      "NAVIGATE_DROPDOWN": "Điều hướng các mục thả xuống",
+      "RESOLVE_CONVERSATION": "Giải quyết cuộc trò chuyện",
+      "GO_TO_CONVERSATION_DASHBOARD": "Đi tới Trang tổng quan cuộc trò chuyện",
+      "ADD_ATTACHMENT": "Thêm đính kèm",
+      "GO_TO_CONTACTS_DASHBOARD": "Đi tới Trang tổng quan liên hệ",
+      "TOGGLE_SIDEBAR": "Chuyển đổi thanh bên",
+      "GO_TO_REPORTS_SIDEBAR": "Đi đến thanh bên Báo cáo",
+      "MOVE_TO_NEXT_TAB": "Di chuyển đến tab tiếp theo trong danh sách cuộc trò chuyện",
+      "GO_TO_SETTINGS": "Đi đến Cài đặt",
+      "SWITCH_CONVERSATION_STATUS": "Chuyển sang trạng thái cuộc trò chuyện tiếp theo",
+      "SWITCH_TO_PRIVATE_NOTE": "Chuyển sang Ghi chú Riêng tư",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Chuyển đổi trình chỉnh sửa Nội dung đa dạng thức",
+      "SWITCH_TO_REPLY": "Chuyển sang phản hồi",
+      "TOGGLE_SNOOZE_DROPDOWN": "Chuyển đổi thả xuống tạm dừng"
     },
     "KEYS": {
       "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
diff --git a/app/javascript/dashboard/i18n/locale/vi/signup.json b/app/javascript/dashboard/i18n/locale/vi/signup.json
index 9b645850b..a3e4828c0 100644
--- a/app/javascript/dashboard/i18n/locale/vi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/vi/signup.json
@@ -5,18 +5,18 @@
     "TERMS_ACCEPT": "Bằng cách đăng ký, bạn đồng ý với <a href=\"https://www.chatwoot.com/terms\">T & C</a> và <a href=\"https://www.chatwoot.com/privacy-policy\">Chính sách bảo mật</a>",
     "ACCOUNT_NAME": {
       "LABEL": "Tên tài khoản",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "PLACEHOLDER": "Nhập tên tài khoản. ví dụ: Wayne Enterprises",
+      "ERROR": "Tên tài khoản quá ngắn"
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "Tên đầy đủ",
+      "PLACEHOLDER": "Nhập tên đầy đủ của bạn. ví dụ: Wayne Enterprises",
+      "ERROR": "Tên đầy đủ quá ngắn"
     },
     "EMAIL": {
-      "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "LABEL": "Email công việc",
+      "PLACEHOLDER": "Nhập email công việc của bạn. ví dụ: bruce@wayne.enterprises",
+      "ERROR": "Địa chỉ email hợp lệ"
     },
     "PASSWORD": {
       "LABEL": "Mật khẩu",
@@ -33,6 +33,6 @@
       "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau."
     },
     "SUBMIT": "Gửi",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "HAVE_AN_ACCOUNT": "Đã có tài khoản?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
index 863eefabc..a1e7fe008 100644
--- a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
@@ -2,34 +2,34 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Tạo nhóm mới",
     "HEADER": "Nhóm",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Nhóm</b></p> <p>Nhóm cho phép bạn tổ chức các đại lý của mình thành các nhóm dựa trên trách nhiệm của họ. <br /> Một đại lý có thể là một phần của nhiều nhóm. Bạn có thể chỉ định các cuộc trò chuyện cho một nhóm khi bạn đang làm việc cộng tác. </p>",
     "LIST": {
-      "404": "There are no teams created on this account.",
-      "EDIT_TEAM": "Edit team"
+      "404": "Không có nhóm nào được tạo đối với tài khoản này.",
+      "EDIT_TEAM": "Sửa nhóm"
     },
     "CREATE_FLOW": {
       "CREATE": {
-        "TITLE": "Create a new team",
-        "DESC": "Add a title and description to your new team."
+        "TITLE": "Tạo nhóm mới",
+        "DESC": "Thêm tiêu đề và mô tả cho nhóm mới."
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Add agents to team",
-        "TITLE": "Add agents to team - %{teamName}",
-        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+        "BUTTON_TEXT": "Thêm đại lý vào nhóm",
+        "TITLE": "Thêm đại lý vào nhóm - %{teamName}",
+        "DESC": "Thêm Đại lý vào nhóm mới tạo của bạn. Điều này cho phép bạn cộng tác như một nhóm trong các cuộc trò chuyện, nhận thông báo về các sự kiện mới trong cùng một cuộc trò chuyện."
       },
       "WIZARD": [
         {
           "title": "Tạo",
           "route": "settings_teams_new",
-          "body": "Create a new team of agents."
+          "body": "Tạo ra một nhóm đại lý mới."
         },
         {
           "title": "Thêm đại lý",
           "route": "settings_teams_add_agents",
-          "body": "Add agents to the team."
+          "body": "Thêm đại lý vào nhóm."
         },
         {
-          "title": "Finish",
+          "title": "Hoàn tất",
           "route": "settings_teams_finish",
           "body": "Bạn đã sẵn sàng để đi!"
         }
@@ -37,89 +37,89 @@
     },
     "EDIT_FLOW": {
       "CREATE": {
-        "TITLE": "Edit your team details",
-        "DESC": "Edit title and description to your team.",
-        "BUTTON_TEXT": "Update team"
+        "TITLE": "Sửa chi tiết nhóm",
+        "DESC": "Sửa tiêu đề và mô tả cho nhóm.",
+        "BUTTON_TEXT": "Cập nhật nhóm"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Update agents in team",
-        "TITLE": "Add agents to team - %{teamName}",
-        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+        "BUTTON_TEXT": "Cập nhật đại lý trong nhóm",
+        "TITLE": "Thêm đại lý vào nhóm - %{teamName}",
+        "DESC": "Thêm Đại lý vào nhóm mới tạo của bạn. Tất cả các đại lý được thêm vào sẽ nhận được thông báo khi có cuộc trò chuyện được phân công cho nhóm này."
       },
       "WIZARD": [
         {
-          "title": "Team details",
+          "title": "Chi tiết nhóm",
           "route": "settings_teams_edit",
-          "body": "Change name, description and other details."
+          "body": "Đổi tên, mô tả và các chi tiết khác."
         },
         {
-          "title": "Edit Agents",
+          "title": "Sửa đại lý",
           "route": "settings_teams_edit_members",
-          "body": "Edit agents in your team."
+          "body": "Sửa đại lý trong nhóm của bạn."
         },
         {
-          "title": "Finish",
+          "title": "Hoàn tất",
           "route": "settings_teams_edit_finish",
           "body": "Bạn đã sẵn sàng để đi!"
         }
       ]
     },
     "TEAM_FORM": {
-      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+      "ERROR_MESSAGE": "Không thể lưu chi tiết nhóm. Thử lại."
     },
     "AGENTS": {
-      "AGENT": "AGENT",
+      "AGENT": "ĐẠI LÝ",
       "EMAIL": "EMAIL",
       "BUTTON_TEXT": "Thêm các nhà cung cấp",
-      "ADD_AGENTS": "Adding Agents to your Team...",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+      "ADD_AGENTS": "Thêm đại lý vào nhóm của bạn...",
+      "SELECT": "chọn",
+      "SELECT_ALL": "chọn tất cả đại lý",
+      "SELECTED_COUNT": "%{selected} trên %{total} đại lý được chọn."
     },
     "ADD": {
-      "TITLE": "Add agents to team - %{teamName}",
-      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "TITLE": "Thêm đại lý vào nhóm - %{teamName}",
+      "DESC": "Thêm Đại lý vào nhóm mới tạo của bạn. Điều này cho phép bạn cộng tác như một nhóm trong các cuộc trò chuyện, nhận thông báo về các sự kiện mới trong cùng một cuộc trò chuyện.",
+      "SELECT": "chọn",
+      "SELECT_ALL": "chọn tất cả đại lý",
+      "SELECTED_COUNT": "%{selected} trên %{total} đại lý được chọn.",
       "BUTTON_TEXT": "Thêm các nhà cung cấp",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Chọn ít nhất một đại lý."
     },
     "FINISH": {
-      "TITLE": "Your team is ready!",
-      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
-      "BUTTON_TEXT": "Finish"
+      "TITLE": "Nhóm của bạn đã sẵn sàng!",
+      "MESSAGE": "Giờ đây, bạn có thể cộng tác với tư cách là một nhóm trong các cuộc trò chuyện. Chúc ủng hộ vui vẻ ",
+      "BUTTON_TEXT": "Hoàn tất"
     },
     "DELETE": {
       "BUTTON_TEXT": "Xoá",
       "API": {
-        "SUCCESS_MESSAGE": "Team deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+        "SUCCESS_MESSAGE": "Nhóm được xoá thành công.",
+        "ERROR_MESSAGE": "Không thể xoá nhóm. Thử lại."
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{teamName}",
-        "PLACE_HOLDER": "Please type {teamName} to confirm",
-        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "TITLE": "Bạn có chắc muốn xoá - %{teamName}",
+        "PLACE_HOLDER": "Vui lòng điền {teamName} để xác nhận",
+        "MESSAGE": "Xóa nhóm sẽ xóa phân công nhóm khỏi các cuộc trò chuyện được phân công cho nhóm này.",
         "YES": "Xoá ",
         "NO": "Huỷ"
       }
     },
     "SETTINGS": "Cài đặt",
     "FORM": {
-      "UPDATE": "Update team",
-      "CREATE": "Create team",
+      "UPDATE": "Cập nhật nhóm",
+      "CREATE": "Tạo nhóm",
       "NAME": {
-        "LABEL": "Team name",
-        "PLACEHOLDER": "Example: Sales, Customer Support"
+        "LABEL": "Tên nhóm",
+        "PLACEHOLDER": "Ví dụ: Bán hàng, Hỗ trợ khách hàng"
       },
       "DESCRIPTION": {
-        "LABEL": "Team Description",
-        "PLACEHOLDER": "Short description about this team."
+        "LABEL": "Mô tả nhóm",
+        "PLACEHOLDER": "Mô tả ngắn về nhóm này."
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Allow auto assign for this team."
+        "LABEL": "Cho phép tự động phân công đối với nhóm này."
       },
-      "SUBMIT_CREATE": "Create team"
+      "SUBMIT_CREATE": "Tạo nhóm"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index fbd2840f2..17be79cbe 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 5706c5c5b..4a32774b2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 5b6d15f56..50da39de5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -184,6 +184,7 @@
     }
   },
   "EMAIL_HEADER": {
+    "FROM": "From",
     "TO": "To",
     "BCC": "密件副本",
     "CC": "副本",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index be2525943..d3006b2b4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -521,7 +521,11 @@
       "DOMAIN": {
         "LABEL": "Domain",
         "PLACE_HOLDER": "Domain"
-      }
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
     }
   }
 }
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index a02ce7ad8..872bdd42b 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -8,8 +8,8 @@
       "SUBMIT": "Wyślij"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Wyślij wiadomość ponownie",
+      "ERROR_MESSAGE": "Nie udało się wysłać! Spróbuj ponownie"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -22,12 +22,12 @@
     "IN_A_DAY": "Zwykle odpowiadamy w przeciągu jednego dnia"
   },
   "START_CONVERSATION": "Rozpocznij rozmowę",
-  "CONTINUE_CONVERSATION": "Continue conversation",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "CONTINUE_CONVERSATION": "Kontynuuj rozmowę",
+  "START_NEW_CONVERSATION": "Rozpocznij rozmowę",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Pokaż nowe wiadomości",
     "CLOSE_MESSAGES_BUTTON": "Zamknij",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "od",
     "BOT": "Bot"
   },
   "BUBBLE": {
@@ -56,21 +56,21 @@
         "ERROR": "Wiadomość za krótka"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Proszę podać swoje imię i nazwisko oraz adres e-mail przed rozpoczęciem rozmowy"
   },
   "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Nieprawidłowe pole"
     }
   },
   "CSAT": {
     "TITLE": "Oceń udzielone Ci wsparcie",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
+    "SUBMITTED_TITLE": "Dziękujemy za przesłanie oceny",
     "PLACEHOLDER": "Dodaj swój komentarz..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "Poproś o skrypt rozmowy",
     "SEND_EMAIL_SUCCESS": "Transkrypcja czatu została wysłana pomyślnie",
     "SEND_EMAIL_ERROR": "Wystąpił błąd, spróbuj ponownie"
   }
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index 84a1ed311..a12031986 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -8,8 +8,8 @@
       "SUBMIT": "submeter"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Enviar mensagem novamente",
+      "ERROR_MESSAGE": "Não foi possível enviar, tente novamente"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -22,7 +22,7 @@
     "IN_A_DAY": "Normalmente respondemos num dia"
   },
   "START_CONVERSATION": "Iniciar Conversa",
-  "CONTINUE_CONVERSATION": "Continue conversation",
+  "CONTINUE_CONVERSATION": "Continuar conversa",
   "START_NEW_CONVERSATION": "Iniciar uma nova conversa",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Ver novas mensagens",
@@ -56,7 +56,7 @@
         "ERROR": "Mensagem muito pequena"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa"
   },
   "FILE_SIZE_LIMIT": "O ficheiro ultrapassa o tamanho limite {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index d2b21ffee..8481b1786 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -8,13 +8,13 @@
       "SUBMIT": "Gửi"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Gửi lại tin nhắn",
+      "ERROR_MESSAGE": "Không thể gửi, xin thử lại"
     }
   },
   "TEAM_AVAILABILITY": {
     "ONLINE": "Chúng tôi đang trực tuyến",
-    "OFFLINE": "We are away at the moment"
+    "OFFLINE": "Hiện tại chúng tôi đang ngoại tuyến"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "Thường trả lời sau vài phút",
@@ -22,18 +22,18 @@
     "IN_A_DAY": "Thường trả lời trong một ngày"
   },
   "START_CONVERSATION": "Bắt đầu một cuộc trò chuyện",
-  "CONTINUE_CONVERSATION": "Continue conversation",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "CONTINUE_CONVERSATION": "Tiếp tục cuộc trò chuyện",
+  "START_NEW_CONVERSATION": "Bắt đầu cuộc trò chuyện mới",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Xem tin nhắn mới",
     "CLOSE_MESSAGES_BUTTON": "Đóng",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "từ",
     "BOT": "Bot"
   },
   "BUBBLE": {
     "LABEL": "Trò chuyện với chúng tôi"
   },
-  "POWERED_BY": "Powered by Chatwoot",
+  "POWERED_BY": "Cung cấp bởi Chatwoot",
   "EMAIL_PLACEHOLDER": "Vui lòng nhập email",
   "CHAT_PLACEHOLDER": "Gõ tin nhắn của bạn",
   "TODAY": "Hôm nay",
@@ -43,34 +43,34 @@
       "FULL_NAME": {
         "LABEL": "Tên đầy đủ",
         "PLACEHOLDER": "Vui lòng nhập tên đầy đủ của bạn",
-        "ERROR": "Full Name is required"
+        "ERROR": "Tên đầy đủ là bắt buộc"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email",
-        "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "PLACEHOLDER": "Vui lòng nhập email",
+        "ERROR": "Email không hợp lệ"
       },
       "MESSAGE": {
         "LABEL": "Tin nhắn",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "PLACEHOLDER": "Vui lòng nhập tin nhắn",
+        "ERROR": "Tin nhắnn quá ngắn"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Vui lòng cung cấp tên và địa chỉ email của bạn trước khi bắt đầu cuộc trò chuyện"
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "FILE_SIZE_LIMIT": "File vượt quá kích thước giới hạn {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Trường không hợp lệ"
     }
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Đánh giá cuộc trò chuyện",
+    "SUBMITTED_TITLE": "Cảm ơn vì đã đánh giá",
+    "PLACEHOLDER": "Cho chúng tôi biết thêm..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "Yêu cầu bản ghi cuộc trò chuyện",
     "SEND_EMAIL_SUCCESS": "Bản ghi cuộc trò chuyện đã được gửi thành công",
     "SEND_EMAIL_ERROR": "Đã có lỗi, vui lòng thử lại"
   }
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 61b0c71c5..34da9f4d7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -29,7 +29,7 @@ pl:
       failed: Rejestracja nie powiodła się
     contacts:
       import:
-        failed: File is blank
+        failed: Plik jest pusty
   reports:
     period: Okres raportowania od %{since} do %{until}
     agent_csv:
@@ -38,7 +38,7 @@ pl:
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
     team_csv:
-      team_name: Team name
+      team_name: Nazwa zespołu
       conversations_count: Liczba rozmów
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
@@ -56,7 +56,7 @@ pl:
         resolved: "Rozmowa została oznaczona przez %{user_name}"
         open: "Rozmowa została ponownie otwarta przez %{user_name}"
         pending: "Rozmowa została oznaczona jako oczekująca przez %{user_name}"
-        snoozed: "Conversation was snoozed by %{user_name}"
+        snoozed: "Rozmowa została uśpiona przez %{user_name}"
         auto_resolved: "Rozmowa została oznaczona przez system jako rozwiązana z powodu %{duration} dni bezczynności"
       assignee:
         self_assigned: "%{user_name} przypisał się do tej rozmowy"
@@ -75,19 +75,19 @@ pl:
       greeting_message_body: "%{account_name} zazwyczaj odpowiada w ciągu kilku godzin."
       ways_to_reach_you_message_body: "Daj zespołowi możliwość dotarcia do Ciebie."
       email_input_box_message_body: "Otrzymuj powiadomienia przez e-mail"
-      csat_input_message_body: "Please rate the conversation"
+      csat_input_message_body: "Oceń rozmowę"
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: '%{assignee_name} z %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} z %{inbox_name} <reply+%{reply_email}>'
       email_subject: "Nowe wiadomości w tej dyskusji"
       transcript_subject: "Transkrypcja rozmowy"
     survey:
-      response: "Please rate this conversation, %{link}"
+      response: "Oceń tę rozmowę, %{link}"
   contacts:
     online:
-      delete: "%{contact_name} is Online, please try again later"
+      delete: "%{contact_name} jest online, spróbuj ponownie później"
   integration_apps:
     slack:
       name: "Slack"
@@ -96,8 +96,8 @@ pl:
       name: "Webhooki"
       description: "Webhooki dostarczają informacji o tym, co dzieje się na Twoim koncie do usług zewnętrznych. Możesz wykorzystać webhooki do przekazywania wydarzeń do ulubionych aplikacji, takich jak Slack lub Github. Kliknij na Konfiguruj, aby skonfigurować webhooki."
     dialogflow:
-      name: "Dialogflow"
-      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+      name: "Przepływ Dialogu"
+      description: "Zbuduj czatboty używając Dialogflow i szybko podłącz je do skrzynki odbiorczej. Pozwól botom na obsługę zapytań przed oddaniem ich agentowi obsługi klienta."
     fullcontact:
-      name: "Fullcontact"
+      name: "Pełny kontakt"
       description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 6099dd46c..7198b87e7 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -17,7 +17,7 @@
 #To learn more, please read the Rails Internationalization guide
 #available at https://guides.rubyonrails.org/i18n.html.
 vi:
-  hello: "Hello world"
+  hello: "Xin chào bạn"
   messages:
     reset_password_success: Chà! Yêu cầu đặt lại mật khẩu thành công. Kiểm tra thư của bạn để biết hướng dẫn.
     reset_password_failure: Uh ho! Chúng tôi không thể tìm thấy bất kỳ người dùng nào có email được chỉ định.
@@ -29,75 +29,75 @@ vi:
       failed: Đăng ký thât bại
     contacts:
       import:
-        failed: File is blank
+        failed: Chưa chọn file
   reports:
-    period: Reporting period %{since} to %{until}
+    period: Thời gian báo cáo từ %{since} đến %{until}
     agent_csv:
-      agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      agent_name: Tên nhà cung cấp
+      conversations_count: Số cuộc trò chuyện
+      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
+      avg_resolution_time: Thời gian giải quyết trung bình (phút)
     team_csv:
-      team_name: Team name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      team_name: Tên nhóm
+      conversations_count: Số cuộc trò chuyện
+      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
+      avg_resolution_time: Thời gian giải quyết trung bình (phút)
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Cuộc trò chuyện mới] - #%{display_id} đã được tạo trong %{inbox_name}"
+      conversation_assignment: "[Phân công cho bạn] - #%{display_id} đã được phân công cho bạn"
+      assigned_conversation_new_message: "[Tin nhắn mới] - #%{display_id} %{content}"
+      conversation_mention: "Bạn đã được nhắn đến trong cuộc trò chuyện [ID - %{display_id}] bởi %{name}"
   conversations:
     messages:
-      deleted: This message was deleted
+      deleted: Tin nhắn đã bị xoá
     activity:
       status:
         resolved: "Cuộc trò chuyện được đánh dấu là đã giải quyết bởi %{user_name}"
         open: "Cuộc trò chuyện đã được mở lại bởi %{user_name}"
-        pending: "Conversation was marked as pending by %{user_name}"
-        snoozed: "Conversation was snoozed by %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        pending: "Cuộc trò chuyện được đánh dấu là chưa giải quyết bởi %{user_name}"
+        snoozed: "Cuộc trò chuyện đã được tạm dừng lại bởi %{user_name}"
+        auto_resolved: "Cuộc trò chuyện được đánh dấu là đã giải quyết bởi hệ thống vì %{duration} ngày không hoạt động"
       assignee:
-        self_assigned: "%{user_name} self-assigned this conversation"
+        self_assigned: "%{user_name} phân công chính mình vào cuộc trò chuyện này"
         assigned: "Chỉ định %{assignee_name} bởi %{user_name}"
         removed: "Cuộc hội thoại chưa được chỉ định bởi %{user_name}"
       team:
         assigned: "Chỉ định %{team_name} bởi %{user_name}"
-        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
-        removed: "Unassigned from %{team_name} by %{user_name}"
+        assigned_with_assignee: "Phân công cho %{assignee_name} thông qua %{team_name} bởi %{user_name}"
+        removed: "Huỷ phân công cho %{team_name} bởi %{user_name}"
       labels:
-        added: "%{user_name} added %{labels}"
-        removed: "%{user_name} removed %{labels}"
-      muted: "%{user_name} has muted the conversation"
-      unmuted: "%{user_name} has unmuted the conversation"
+        added: "%{user_name} thêm %{labels}"
+        removed: "%{user_name} xoá %{labels}"
+      muted: "%{user_name} đã tắt tiếng cuộc trò chuyện"
+      unmuted: "%{user_name} đã bật tiếng cuộc trò chuyện"
     templates:
       greeting_message_body: "%{account_name} thường trả lời trong vài giờ."
       ways_to_reach_you_message_body: "Cung cấp cho nhóm một cách để tiếp cận bạn."
       email_input_box_message_body: "Nhận thông báo qua email"
-      csat_input_message_body: "Please rate the conversation"
+      csat_input_message_body: "Bạn hãy vui lòng đánh giá cuộc trò chuyện"
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: '%{assignee_name} từ %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} từ %{inbox_name} <reply+%{reply_email}>'
       email_subject: "Tin nhắn mới về cuộc trò chuyện này"
       transcript_subject: "Bản ghi cuộc hội thoại"
     survey:
-      response: "Please rate this conversation, %{link}"
+      response: "Bạn hãy vui lòng đánh giá cuộc trò chuyện, %{link}"
   contacts:
     online:
-      delete: "%{contact_name} is Online, please try again later"
+      delete: "%{contact_name} đang trực tiếng, vui lòng thử lại sau"
   integration_apps:
     slack:
       name: "Slack"
-      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+      description: "Slack là một công cụ trò chuyện giúp mang tất cả các cuộc giao tiếp của bạn lại với nhau ở một nơi. Bằng cách tích hợp Slack, bạn có thể nhận được thông báo về tất cả các cuộc trò chuyện mới trong tài khoản của mình ngay bên trong Slack."
     webhooks:
       name: "Webhooks"
-      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+      description: "Sự kiện webhook cung cấp cho bạn thông tin thời gian thực về những gì đang xảy ra trong tài khoản của bạn. Bạn có thể sử dụng webhook để truyền tải các sự kiện tới các ứng dụng yêu thích của mình như Slack hoặc Github. Nhấp vào Cấu hình để thiết lập webhook của bạn."
     dialogflow:
       name: "Dialogflow"
-      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+      description: "Xây dựng chatbot bằng Dialogflow và kết nối chúng với hộp thư đến của bạn một cách nhanh chóng. Hãy để các bot xử lý các truy vấn trước khi giao chúng cho đại lý dịch vụ khách hàng."
     fullcontact:
       name: "Fullcontact"
-      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
+      description: "Tích hợp FullContact giúp làm phong phú hồ sơ khách truy cập. Xác định người dùng ngay khi họ chia sẻ địa chỉ email và cung cấp cho họ dịch vụ khách hàng phù hợp. Kết nối FullContact với tài khoản của bạn bằng cách chia sẻ Khóa API FullContact."

From 9c7044c81b1172381b3528ea6435d013de35b9a7 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 14 Feb 2022 17:37:40 +0530
Subject: [PATCH 087/101] fix: Use default from attribute if undefined (#3977)

---
 .../components/widgets/conversation/bubble/MailHead.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue
index 43112a5c8..211ffeaa6 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue
@@ -51,7 +51,7 @@ export default {
   },
   computed: {
     fromMail() {
-      const from = this.emailAttributes.from;
+      const from = this.emailAttributes.from || [];
       return from.join(', ');
     },
     toMails() {

From f34a2e611507eeeeffab0bbe1cf766490567b16f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 20:09:21 +0530
Subject: [PATCH 088/101] chore(deps): bump puma from to 5.6.2, rails to
 6.1.4.6 (#3969)

---
 Gemfile.lock                                  | 116 +++++++++---------
 .../v1/accounts/campaigns_controller_spec.rb  |   5 +-
 2 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f1e056bc..4df118291 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,63 +9,63 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actioncable (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activestorage (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionmailbox (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      actionview (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionmailer (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.3)
-      actionview (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionpack (6.1.4.6)
+      actionview (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activestorage (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actiontext (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.3)
-      activesupport (= 6.1.4.3)
+    actionview (6.1.4.6)
+      activesupport (= 6.1.4.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_query_trace (1.8)
-    activejob (6.1.4.3)
-      activesupport (= 6.1.4.3)
+    activejob (6.1.4.6)
+      activesupport (= 6.1.4.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.3)
-      activesupport (= 6.1.4.3)
-    activerecord (6.1.4.3)
-      activemodel (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    activemodel (6.1.4.6)
+      activesupport (= 6.1.4.6)
+    activerecord (6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
     activerecord-import (1.2.0)
       activerecord (>= 3.2)
-    activestorage (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    activestorage (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.3)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -300,7 +300,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -346,7 +346,7 @@ GEM
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.13.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -400,7 +400,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.5.2)
+    puma (5.6.2)
       nio4r (~> 2.0)
     pundit (2.1.1)
       activesupport (>= 3.0.0)
@@ -416,29 +416,29 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-timeout (0.6.0)
-    rails (6.1.4.3)
-      actioncable (= 6.1.4.3)
-      actionmailbox (= 6.1.4.3)
-      actionmailer (= 6.1.4.3)
-      actionpack (= 6.1.4.3)
-      actiontext (= 6.1.4.3)
-      actionview (= 6.1.4.3)
-      activejob (= 6.1.4.3)
-      activemodel (= 6.1.4.3)
-      activerecord (= 6.1.4.3)
-      activestorage (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    rails (6.1.4.6)
+      actioncable (= 6.1.4.6)
+      actionmailbox (= 6.1.4.6)
+      actionmailer (= 6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actiontext (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.3)
+      railties (= 6.1.4.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.3)
-      actionpack (= 6.1.4.3)
-      activesupport (= 6.1.4.3)
+    railties (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -583,7 +583,7 @@ GEM
     squasher (0.6.2)
     statsd-ruby (1.5.0)
     telephone_number (1.4.12)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     time_diff (0.3.0)
       activesupport
@@ -635,7 +635,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.0)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   arm64-darwin-20
diff --git a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
index e4036ee5a..219e8f0b9 100644
--- a/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/campaigns_controller_spec.rb
@@ -131,11 +131,12 @@ RSpec.describe 'Campaigns API', type: :request do
         twilio_inbox = create(:inbox, channel: twilio_sms)
         label1 = create(:label, account: account)
         label2 = create(:label, account: account)
+        scheduled_at = 2.days.from_now
 
         post "/api/v1/accounts/#{account.id}/campaigns",
              params: {
                inbox_id: twilio_inbox.id, title: 'test', message: 'test message',
-               scheduled_at: 2.days.from_now,
+               scheduled_at: scheduled_at,
                audience: [{ type: 'Label', id: label1.id }, { type: 'Label', id: label2.id }]
              },
              headers: administrator.create_new_auth_token,
@@ -145,7 +146,7 @@ RSpec.describe 'Campaigns API', type: :request do
         response_data = JSON.parse(response.body, symbolize_names: true)
         expect(response_data[:campaign_type]).to eq('one_off')
         expect(response_data[:scheduled_at].present?).to eq true
-        expect(response_data[:scheduled_at]).to eq(2.days.from_now.to_i)
+        expect(response_data[:scheduled_at]).to eq(scheduled_at.to_i)
         expect(response_data[:audience].pluck(:id)).to include(label1.id, label2.id)
       end
     end

From de4e4c6f65e32fc3259686dbe3fdc18c52ef1555 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 14 Feb 2022 20:22:58 +0530
Subject: [PATCH 089/101] fix: html content is available and mail_part empty
 (#3964)

---
 app/presenters/mail_presenter.rb       |  25 +++--
 spec/fixtures/files/support_1.eml      | 144 +++++++++++++++++++++++++
 spec/mailboxes/support_mailbox_spec.rb |  23 ++++
 3 files changed, 183 insertions(+), 9 deletions(-)
 create mode 100644 spec/fixtures/files/support_1.eml

diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index 4ad650db8..e42bbbf7b 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -27,17 +27,21 @@ class MailPresenter < SimpleDelegator
   end
 
   # returns encoded mail body text_part if available.
-  # returns encoded mail body as it is if mail_part not available.
+  # returns encoded raw mail body as it is if mail_part not available.
   # else returns parsed the html body if contains text/html content.
   def select_body(mail_part)
-    return encoded_mail_body unless mail_part
+    decoded = if mail_part
+                mail_part.decoded
+              else
+                raw_mail_body
+              end
 
-    decoded = encode_to_unicode(mail_part.decoded)
+    encoded = encode_to_unicode(decoded)
 
     if mail.text_part
-      decoded
+      encoded
     elsif html_mail_body?
-      ::HtmlParser.parse_reply(decoded)
+      ::HtmlParser.parse_reply(encoded)
     end
   end
 
@@ -131,12 +135,15 @@ class MailPresenter < SimpleDelegator
   end
 
   def html_mail_body?
-    ((mail.content_type || '').include? 'text/html') || @mail.html_part || @mail.html_part.content_type.include?('text/html')
+    ((mail.content_type || '').include? 'text/html') || @mail.html_part&.content_type&.include?('text/html')
   end
 
-  # returns mail body if mail content_type is text/plain
-  def encoded_mail_body
-    return encode_to_unicode(@mail.body.decoded) if (@mail.content_type || '').include? 'text/plain'
+  def text_mail_body?
+    ((mail.content_type || '').include? 'text') || @mail.text_part&.content_type&.include?('text')
+  end
+
+  def raw_mail_body
+    return @mail.body.decoded if html_mail_body? || text_mail_body?
 
     ''
   end
diff --git a/spec/fixtures/files/support_1.eml b/spec/fixtures/files/support_1.eml
new file mode 100644
index 000000000..c16f461cf
--- /dev/null
+++ b/spec/fixtures/files/support_1.eml
@@ -0,0 +1,144 @@
+Date: Fri, 11 Feb 2022 05:15:51 +0000
+Mime-Version: 1.0
+Subject: Get Paid to post an article
+From: sony@chatwoot.com
+To: care@example.com
+X-Mailgun-Tag: test1
+X-Mailgun-Track-Clicks: true
+X-Mailgun-Track: true
+X-Mailgun-Track-Opens: true
+Message-Id: <20220211051551.0ac6490aa10da09b@chatwoot.com>
+Content-Type: text/html; charset="ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE html>
+<html>
+
+<head>
+<title></title>
+<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8=
+" />
+<meta name=3D"viewport" content=3D"width=3Ddevice-width, initial-scale=
+=3D1">
+<meta http-equiv=3D"X-UA-Compatible" content=3D"IE=3Dedge" />
+<style type=3D"text/css">
+@media screen {
+@font-face {
+font-family: 'Lato';
+font-style: normal;
+font-weight: 400;
+src: local('Lato Regular'), local('Lato-Regular'), url(http=
+s://fonts.gstatic.com/s/lato/v11/qIIYRU-oROkIk8vfvxw6QvesZW2xOQ-xsNqO47m55D=
+A.woff) format('woff');
+}
+
+@font-face {
+font-family: 'Lato';
+font-style: normal;
+font-weight: 700;
+src: local('Lato Bold'), local('Lato-Bold'), url(https://fo=
+nts.gstatic.com/s/lato/v11/qdgUG4U09HnJwhYI-uK18wLUuEpTyoUstqEm5AMlJo4.woff=
+) format('woff');
+}
+
+@font-face {
+font-family: 'Lato';
+font-style: italic;
+font-weight: 400;
+src: local('Lato Italic'), local('Lato-Italic'), url(https:=
+//fonts.gstatic.com/s/lato/v11/RYyZNoeFgb0l7W3Vu1aSWOvvDin1pK8aKteLpeZ5c0A.=
+woff) format('woff');
+}
+
+@font-face {
+font-family: 'Lato';
+font-style: italic;
+font-weight: 700;
+src: local('Lato Bold Italic'), local('Lato-BoldItalic'), u=
+rl(https://fonts.gstatic.com/s/lato/v11/HkF_qI1x_noxlxhrhMQYELO3LdcAZYWl9Si=
+6vvxL-qU.woff) format('woff');
+}
+}
+
+/* CLIENT-SPECIFIC STYLES */
+body,
+table,
+td,
+a {
+-webkit-text-size-adjust: 100%;
+-ms-text-size-adjust: 100%;
+}
+
+table,
+td {
+mso-table-lspace: 0pt;
+mso-table-rspace: 0pt;
+}
+td{
+
+}
+
+img {
+-ms-interpolation-mode: bicubic;
+}
+
+/* RESET STYLES */
+img {
+border: 0;
+height: auto;
+line-height: 100%;
+outline: none;
+text-decoration: none;
+}
+
+table {
+border-collapse: collapse !important;
+}
+
+body {
+height: 100% !important;
+margin: 0 !important;
+padding: 0 !important;
+width: 100% !important;
+background-color: black;
+}
+
+/* iOS BLUE LINKS */
+a[x-apple-data-detectors] {
+color: inherit !important;
+text-decoration: none !important;
+font-size: inherit !important;
+font-family: inherit !important;
+font-weight: inherit !important;
+line-height: inherit !important;
+}
+
+/* MOBILE STYLES */
+@media screen and (max-width:600px) {
+h1 {
+font-size: 32px !important;
+line-height: 32px !important;
+}
+}
+
+/* ANDROID CENTER FIX */
+div[style*=3D"margin: 16px 0;"] {
+margin: 0 !important;
+}
+</style>
+</head>
+
+<body>
+<div>
+Hi,<br /><br />We are providing you platform from here you can sell=
+paid posts on your website.
+
+<div style=3D'width:100%'><p>Chatwoot | CS team | <a href=3D"https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg">C</hatwoota></p>
+<p>Skype: live:.cid.something</p>
+</d=
+iv>
+</div>
+<img width=3D"1px" height=3D"1px" alt=3D"" src=3D"https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg"></=
+body>
+
+</html>
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
index 1dda7be31..e25cee6de 100644
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ b/spec/mailboxes/support_mailbox_spec.rb
@@ -156,5 +156,28 @@ RSpec.describe SupportMailbox, type: :mailbox do
         expect(conversation_1.messages.count).to eq(2)
       end
     end
+
+    describe 'when mail part is not present' do
+      let(:support_mail) { create_inbound_email_from_fixture('support_1.eml') }
+      let(:described_subject) { described_class.receive support_mail }
+
+      it 'Considers raw html mail body' do
+        described_subject
+        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
+        expect(conversation.messages.last.content).to include(
+          <<-BODY.strip_heredoc.chomp
+            Hi,
+            We are providing you platform from here you can sellpaid posts on your website.
+
+            Chatwoot | CS team | [C](https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg)
+
+            Skype: live:.cid.something
+
+            []
+          BODY
+        )
+        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('Get Paid to post an article')
+      end
+    end
   end
 end

From d5c9193d1ae54c6dbb7d82ce4cbd6bcc2b4f27b3 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 15 Feb 2022 10:28:04 +0530
Subject: [PATCH 090/101] feat: Add specs for reply-to changes (#3959)

---
 app/presenters/mail_presenter.rb       |   2 +-
 spec/fixtures/files/reply_to.eml       | 632 +++++++++++++++++++++++++
 spec/mailboxes/reply_mailbox_spec.rb   |  28 +-
 spec/mailboxes/support_mailbox_spec.rb |  19 +
 4 files changed, 679 insertions(+), 2 deletions(-)
 create mode 100644 spec/fixtures/files/reply_to.eml

diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index e42bbbf7b..bea652eb7 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -103,7 +103,7 @@ class MailPresenter < SimpleDelegator
   end
 
   def original_sender
-    @mail['X-Original-Sender'].try(:value) || from.first
+    @mail[:reply_to].try(:value) || @mail['X-Original-Sender'].try(:value) || from.first
   end
 
   def email_forwarded_for
diff --git a/spec/fixtures/files/reply_to.eml b/spec/fixtures/files/reply_to.eml
new file mode 100644
index 000000000..03ab4f87c
--- /dev/null
+++ b/spec/fixtures/files/reply_to.eml
@@ -0,0 +1,632 @@
+From: Sony Mathew <sony@chatwoot.com>
+Reply-To: <reply+someidmfdvkjdnkjciwyreowuero83@chatwoot.com>
+Mime-Version: 1.0 (Apple Message framework v1244.3)
+Content-Type: multipart/alternative; boundary="Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74"
+Subject: Discussion: Let's debate these attachments
+Date: Tue, 20 Apr 2020 04:20:20 -0400
+To: "Replies" <test@example.com>
+In-Reply-To: <conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123@test.com>
+References: <4e6e35f5a38b4_479f13bb90078178@small-app-01.mail>
+Message-Id: <0CB459E0-0336-41DA-BC88-E6E28C697DDB@chatwoot.com>
+X-Mailer: Apple Mail (2.1244.3)
+
+--Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+  charset=utf-8
+
+Let's talk about these images:
+
+
+--Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74
+Content-Type: multipart/related;
+  type="text/html";
+  boundary="Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1"
+
+
+--Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
+Content-Transfer-Encoding: base64
+Content-Disposition: inline;
+  filename=avatar1.jpeg
+Content-Type: image/jpg;
+  name="avatar1.jpeg"
+Content-Id: <7AAEB353-2341-4D46-A054-5CA5CB2363B7>
+
+/9j/4AAQSkZJRgABAQAAAQABAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdC
+IFhZWiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAA
+AADTLUhQICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFj
+cHJ0AAABUAAAADNkZXNjAAABhAAAAGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAA
+ABRnWFlaAAACLAAAABRiWFlaAAACQAAAABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAAD
+TAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAAABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJD
+AAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAACAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5
+OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAAAAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEA
+AAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAABFsxYWVogAAAAAAAAAAAAAAAA
+AAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAA
+AA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAFklFQyBo
+dHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAt
+IHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAt
+IHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg
+Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENv
+bmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAA
+ABOk/gAUXy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAA
+AAABAAAAAAAAAAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAK
+AA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUA
+mgCfAKQAqQCuALIAtwC8AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEy
+ATgBPgFFAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMC
+DAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMh
+Ay0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4E
+jASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3
+BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gflB/gICwgfCDII
+RghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicKPQpUCmoKgQqY
+Cq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0mDUAN
+Wg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBh
+EH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMTIxNDE2MTgxOkE8UT
+5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbWFvoXHRdBF2UXiReu
+F9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9oc
+AhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEgbCCY
+IMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVoJZcl
+xyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2
+K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIx
+SjGCMbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDec
+N9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+
+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXe
+RiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN
+3E4lTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYP
+VlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1f
+D19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/
+aJZo7GlDaZpp8WpIap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfBy
+S3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyB
+fOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuH
+n4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5GokhGSepLj
+k02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5Anq6f
+HZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+CoUqjEqTepqaocqo+rAqt1
+q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm4
+0blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZG
+xsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnU
+y9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM4lPi2+Nj
+4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozz
+GfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t////2wBDAAICAgIC
+AQICAgICAgIDAwYEAwMDAwcFBQQGCAcICAgHCAgJCg0LCQkMCggICw8LDA0ODg4OCQsQEQ8OEQ0O
+Dg7/2wBDAQICAgMDAwYEBAYOCQgJDg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4O
+Dg4ODg4ODg4ODg4ODg7/wAARCADwAPADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAEC
+AwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0Kx
+wRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1
+dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ
+2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QA
+tREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYk
+NOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaH
+iImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq
+8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9v1Wob5cWEh5q4v3qhvlzp0gz2oA+XvEwiTXbtWwTuJ59
+6/Mn4tCGP9p+OabLR5UEKeB81fo345uPK8Y3lvnkj86/M341XaW3xuSfjYeWz3IPFAHv+r6mINN0
+LdLt3na+Bnj6nmvtn4ISiT4eaeN2VVSAfXrX583Eiah4L8PrCgeVmGZT2yucV90fAZnTwLbiQ/vQ
+SKAPrjTseWMVsL0rhdU8UaF4R8E3/iLxJqUGkaLYw+Zd3UxwqD8OSScDA55r4n8Yftla1r0l/bfC
+rwxcQaWG2w6zrVs0YkyR8wQ4IVgTtJGTQB+iEl1awRk3FxFEoGSXcKB78kV5n4m+MHwu0W5TStY8
+c+GbS/mDlbd75C20dWO0kjFfiD8Y/ib8V9e1Kzmu/Ef9owLcx3U9pZ6o8TSIzlGgAyAQvXH+1XkX
+iP4ca0uq3ev6fJHo2nXOnTCeVSX8iKVlQfvDncVYqrjrhgegoA+xfi9J+zR4ul8RfEZ/iO/2G5u2
+imtYLDfdCYHaDEpwQrY9ORXhej/DT4A61q2oahonxIkdbexa7vYdV0do4lj3KkgV93Ubs4+pr4ck
+8F+LLmaz068WKwuWl2hJnIFwFTd8vcDaAQehwa5PWfE15HomnaQt1NpMls6xsshDCRxv2yAqM4wS
+Dj1oA/c/9mz4O2Pwt+OGpeJ/D9/4e17wvqaobHU9OvUm2wkE4bPKnPav1XsJ1n0xWVw+ByQfbP8A
+Wv4/tB+N/jHwHbKPDGuXaRXOyS5tIZCsSspPzIeBj2PNfU3w2/4KK+NfC3jjT73UL3UbnThax2dw
+s0rSb23sTcFehbaQuP8AYoA/psHRfxplwhe1IHPB4r81Pgf+394d8ZR6g3ia7tJ7CC4X/TreJ4sR
+FQNxRhuyGznAxzX6SaNq+l6/osGpaVeQX1lOgaOWI8MD0oA+SfjX4S8Rz3yX9pcB9PLbJY8cqCOu
+fxr4J8ZeAr6y1YbJ237+cnOa/YfxtZRT+E7oMoI8tsHNfnX8Q7i2ttfjMwjVdvJPrmgDrf2UPhdb
+vfap4q1PM96lwILTP8AwCx/Wv0UtoPs8CoDkAcV8q/sx6jb3nw4uli+8l64fjHOBX1sBx1BoAjC8
+Uu3PHpUoXj/69L0oAwNZ02C50e4WVN4dcN7jHSvgPxR4b03S/FGrQrbeUBOzqM4wCOBjvX6H3p/0
+F8gkbT0FfnH8d9e/sLx1fGSC5hjkAw7IQrHDd6ALPw9ttNj+K2jzMka4uNqZ+9nFfonZL/oEfPav
+x7+Gev8AiDxP8YtLXw9ps+pXVvcrLNGH2oiZxuJ+nbrX6+6OZjo0AnULJs+bFAGnTgMU6igA7V81
+fHG8srDRLWa5kiTbNxu6/dNfSh5U151488D6R4t8OT22p2a3MRXj1U460AX1B80U26QnTpR3xVlV
+4x39ajuQTZyYGaAPjT4nosXjGeXG1sYQj1r8u/jq+34rQzNgAHDhugz6V+qXxYg/4qhwOAw4NfmB
+8e7Zk8dWqlR8/V2XIHpQB6b4Uxd/DPSIRMWLMHDKPbpX1T4U+JPg74VfCsav441eDRY2ceTE0bGS
+VicAIO5JwK+LLDxloPgfwHo+i6xLNJ4mmKyWljaL5hmQ92C9Fr6j+DX7OF/8afHlp8TPiLHfw+Hh
+KH0zSrp9yKi9BtI+XnmgDfu/D/jT9pXWLHUNVguLLwjHcpcaVpkTsINqnlrg/wAbnghegr2vw9+z
+TpHhnTpILxm1ppJzcKbvDorduP7o6AV9g6Zoum6Lo8NjplnDa2sSbEjjQKBirMkAkYbwuPpmgD8a
+/jx+zvf6ppUy3dxp+kWVjKj6febREFk3Z2lgOFI6+4r5q0eP4p+HPi3caBDp9t4u0a5sJ7q50CZU
+P2YpGFMgJ/5ZnCsMZzX9A2t+GNK1rSJrK/topoJVZGBQelfF/j/9mG1l+IGn+LtKudSi1exiaG2k
+trgoAmDjev8AEP4SO4JoA/Jn4m22kReCfDWtabpuqaNf6jDHca4uopi12qCQ0DDn5gSMDtmvhXUd
+Klt/FkkxZ4nW28+1Mluf3SqcBVz13Zzk1+wvxq/Z08QWvgm0t9Age0tjeiSexsZz5NsrqRIsCvzs
+blmX+E4xxXx/rHwB8ceIYtXWSwvnksdtnYwYO+FCOPlxkDHPNAH58apJfzeIDbugaNQ3mb1wVz06
+VNo+hXd9enT0i8+Vx9yEZI9zX3p4J/Y18Za7dPealGYAB5ayyRk9OpAxzn+lfaHw6/Yw8K+GjDdX
+0dxM+P3m9fnYkc8HpQB+afhT4KeO9Z8E2S6Ok1rLMrRho8KyRHHJwfUV9X/D74+fEv8AZ/8AEtho
+vju/8V6Jp9nai2XU4ZfOjuGByMoflBxxn0r9JtC+HGl6Do8dtaW8duqR+UmE/h+vrWb41+E/hXxx
+4PudI1zSYL61mG12ZRvPGMhuxFAHtXgj9pbwN8bPg8jeFNds5tYe1HmxHLFHK4G8fwkn8K/O34ze
+IvEGh/GG80HW5Qt7AqsHAIRgScYzx1r558cfDH4n/ssfE+08ffC+8vb7w+rGG5tjllkhbOYpFB7A
+5DV2Wl/ETSP2lfhdL9tk0jS/ijo48i3+1XbRrLGTkELn5iP6UAfr5+zJ8OLvwr8MotVvdQuL251S
+NLqRWOFjyoIAr61UYQD0FeQ/BN5z8APDEV3JHJdQ6bDFMydCyoAT+lexYB96AGUYNPwKWgCNkDQl
+W5Br5T/ah8I6Zf8A7Out3clsslzbAXETAYYEH1/GvrCvD/j9bNdfs2+KkQAuLByM98YOKAPiL9iq
+K3HxT8cW5jVnUQvGx6gZI4NfqTGirEFUYGK/KX9ja6Fv+0p4rtndf3umo+M9w4/xr9XEIMS4I6UA
+OoozSblHVh+dAC1VuhnT3HXipvMT+8KqXdwiWL8joe9AGAoPPFOkX/RXzTgCDTn/ANQwoA+R/izF
+/wAVKGPKlDgetfmh+0E+nLrFn54dL5lH2TYMtI5ONuO4r9Jfj/qFrotmdTuXRI44mLEngcGvz9+H
+XhO6+Inx2/4Tnxf5ptYbh10TTwMpGRwHP6cUAdp+zF+zJP4z+IFv4g8a28xWGOKYL5eCADuC8/qK
+/aDStMs9J0W206whjt7aGMJHGiYAArifhp4dj0XwHAxiQXUyhpXUY5x0+mK9LVcUAMKcVWlyGGOl
+Xz05qpcDEZNAFB3A61k3Gx3J6n0x1q5cPgEd6xJJMTHNAFC/0rT7tClzbQSIPVBmvMLn4e6Rb67c
+XdlZwq07hpiRncR06V6dNOPM64+tQF8HcckY7c0AcFb+FNNhgYC3i8wdWCbRUdzpdlGuFjHHcCuq
+1CYpFlQ2Se9c1PORuXkkigDmL62jWJAqfxelYEtuU4UZ56V092ZPJL/dweprJkQtuc79w6YoA4vV
+dJtNS0u6s721guEkRhtdQRyMd6/Ff9qf4KS/DL4uDxZoEVxaaPeEOPs+Va1kGfm46jJz+dfuVNGs
+8GSxLA8jvXzp+0B4Eg8afA/VrN4/KuooWaGYLlhwTQBf/YR/aLl8QaBp3grxRqNtc3gsYza3sT5F
+zhcEsD0bjkV+pIuo/LBDhhjrmv4+PAfjrVvhN+1FpHm3t1pWmremGa6tXKzW7HjfjoRX9J3wU+L9
+j8Qfhdavp2rx6rqdhGq3gA2uRtGHI/2uDn3oA+uDexA4J5+tMN/ED3x9a88S7upow2GTIyQDmmlr
+lpMGQ+2TQB3ralEGPP615D8ZdTiPwM8RrlfnsnABPtXSfZrhxuJevOfifo0138LdVjILZtmwPXjN
+AH5xfs++Jf8AhF/2v4HYOUvYWgfnjqCP5V+v9tr0b6bGyvu+TjFfiz8PbQXX7WXh2EKoR7g/pX7H
+abpoGiwnoAlAGu+vjPy5P0qBtclz0asXUL3T9NtmeRkXb97ccYrjJPiT4Ztrry5NUsVc/wAJmWgD
+0Y6pdO3y7h+FVLy8v205znsccVFouvaXqtukkE0UqseGVwRXVfY4pdPZlwwPSgBPtCD+IVFJeIIH
+5HtXnD6+4J5HHvULavcSRcNgepoA8J+P+iSeMrvTPD6TbYJnMt4yx5PlqckZ9T0qD4VeA9Ni8TaW
+tvFi1tmJIcY3MeRx9Bmuj8W6xHpxS5uZYxc3Eqwwr3bJ5/CvSvh5aK0cV2xiUMRsjVcHPTJoA+g7
+RFjsokUAKB0FW6rW/wDqUHtVmgBrMAue9U5zuXOasP8AKMkZ9qpyAtGTnA9KAMm7GMk9MVzUzYbk
+nJPFdNcgDJOTx6Vz158iltvXrx0oAzWAOfm/IVI6qUXLP+Aqtna2BuJJx0rXS3DRZPpjA9aAOS1A
+b3cIWYD1rl5jiZvvbSOSD0rvbmyzIQCVbGc/zrlru2xFKwQhc/dFAHPSAtjIOzoCeap3EZcGJsq2
+3IYKeaufP5qD5goPAxSF90rHf83TINAHNtbqB8uVnJwc1zfi23YeDbxRF5p8k7sLmu/8tTMemeu4
+jNYniC3WbRXH3d0TKcHAORxQB/O/+0X4TGnfHDV7kwAWtwxLxhcEdwR719n/APBN/wCM1hpHxE1H
+wVr4cXs8I+zXTHLSRDpG/rjqPbFeVftRaOV8a3lvL+7uoyT5eM7k/vZrwf8AZ28Rx+A/2vdC1yec
+WtlHGxedVDHGRxg98n8qAP6MvFHxg8MeHb2W2uNVtRMibvKjILYxkfoRXlQ/aT0l74Rw+Y6g5zuA
+r5TtfgP8VPjF+2r4k1SDV4dF+G8kUElvejLyT70VnCqOnJIHtivraz/Yl8FWunfLrPiFrwIMyNKv
+X1xigD0nwd8dvC+tahDaz3y2t052rHK+M/TtXr/iXUNMvPAN5+8WRXtmIIYYIINfnR8S/wBnbxf4
+BsH1jw/e3Wv6VCSWiCDz4sd8jtXI+Hfin4rm8ItoralLJFHF5WyWP94oHGDnnigDiPCur2ui/tfe
+H724Kx20OqOoI7gsRX6x6z8QtE0P4cyatdXESQRR5GJBuNfj9eaHv8epeyNIiRyiQtjGD611PjLx
+l4n8QX2keCdDmu7/AFC72xwxLJuGT/EfQD3oA6b4k/H3xZ418bvo3h23vnDyYgsbI73YerEVgwfB
+74/arp66uPDDxqfuwz3KiQ/m1foN8Av2evD3w58K2t9c2seoeKriPdfahIoLFz1VM9AK+pU022SM
+KI0X6DkUAfiRo/jz4k/DLxoIdRg1nQLuFvmtrk5hkHoCTg56cGv0n+BvxusfiT4ZuYZ1S01i1Rft
+NvnoOPm/Wuw+Lfwp8PeOfAF/a32n273Rib7PPj54mAOCD9a/LPwh4lvvhH8eZrmTcFj821vR03gE
+YPv0oA+wdT+JOmWCmeXVokY9FZhWt4O+KmieINdOnw6lZXE687N3NfCei/sifHfWvD0V14m8e26X
+fa2SIkD8a4bWvhr8WPgd4ph8QXEyX9tZzh/tUbZ3A8EP/k0Aff3j3UDd/GvT9Osx5zgRFEYZX5jy
+R9BX1Z4LiA0a0d1EcxGWGMdsV8QfDjVLnXviPc6zf4897G2KW5XhGZclgTX3/wCErMy6fFKuPLRQ
+oHtjP86APQbc4jUe1WjytQDCqPYU+WaOGAvIdqjqaAGzEbTyOlUTINmM8is+41yyDOvmqFH8R6Hm
+sefXrMT7FuIM9wW6f0oA1rmQFWAZRxXJ6nchoGUOcj0ps3iHTPtBj+22zT4zsVwTzWNdXkM29VYE
+hucUAWbb57sFi5Xp1rrbMp5Wzg/hXHxPHGZGEinH88ZqzpmpCe9aLzASvJxQBq6tIsKk8Z71wt7d
+K1wI/wC8Ogre1qVpZv3WXyOOeK4p3mMiO6qnXnPH60AMmh+csMHH+1VWe1PlZBNOa4T5klnVJeoD
+EAH8azn1yzRGhN5ayFW+crKp2/rQBYVGR8E/LjFEkMc0Dps8xAhDJ7mnFormz3wzblOfmXnBHak8
+mS3tFcgNuOD3P40Afkb+11p0ln8QEfyE+0NG2GI5MeT8v86+FdOt7P8A4S/Ss23mWksiM5Xg7DuW
+T/vng/hX7J/tYfDNvEXw+/tvTYQ8tsv71UHzNX463dmdE1WeHMqtFd9BztznP/6qAP6Mf2MbhtW/
+Ye8KXd5GXvbMS2byt/y2WORljf3+QLX2AqgghcY+lfAX/BPnxRbah+wRplq0redaatcwN5h5ILBx
++jCv0Et9phDD5uOwxQBmXmkQ31q0UsaFXUhsjOR6V+f/AMd/gMnhjVpfHvhmN47czF9SskXK8nJd
+cD3zX6Odq5/xLpMGteDNT064UFLi2ePpnqp7UAfij491a2ttGa4twhDruyD1Fe+/sYfDo65far8T
+NZt/MneU22m704SMdWGe5r5R+KOkXeia5rGhXqTI9lcPCMjhlDcEfhiv13/Z68NQeG/2b/C1jArA
+LZISSO5GSaAPdoohDbqiAcdKmzmkZgqkk8Cub1bxLY6VCXupo4VHdjigC7rlxFBocrSHACE5r8TP
+ifa/8JZ+0JqGnaQHmlv9UkjhCdTzzX3P8bvj5YWHhe/0zRLuOS6ljKtcI3CDHOD0zivGv2VfhjqP
+iv4nT/EvxDaulhb7otLjljIMjnhpORyOeDQB+gMccSLsVVAHQcV5r8SPC2m+IPAGo2d5AJUmi+Yd
+jg969IxtbJzXHeONUt9M8FXs88ipEsRLMegHqaAPjn4b6dLZ/F7UQd8sjgMGEoIjijyAAv04r9KP
+DlukPhi3YIwZ1DYPB6V+cHgvxRpD+O7S+02CNreOUW81ymPl3PkCTngZ716n8VP+ChX7MPwN8S3P
+hHxh4t1S+8UafDG13p2jaa9w8bOoIXcSq5wc9aAPuaV/LhLBCzcgDsa8u8R+IL5JTH87IeCqDBHN
+fOPgv9qH4sfG/wCHY8S/BT9m/wAQR+GLpd2m674+1uDR7W9TODJHHH5spXjqVGe1a2sP+1rLpLTz
+j9mnwyQMiSS+1O8KDv1gUUAcl8TPH/jDw8zvY+Gtf1lQ/wA6WKDESdiMn5j6ivknxP8AHT4k6pLP
+YaZ4A8QafbSykW9xJK6SSN0OVwdvT8a3PiR8Xvjf4X1aTTda+L/wLudRmQywWml+E7uYEDqCxcYP
+1r5ktv2j/jPca1DDc3XwpmBnKLnTrm3Zz6/KzYoA9Eh+IPxIu9YjkvfDWoadqUISIXKxMzEbuWJ4
+6fSvpnRfix4h0uG0tdVmlluDKUQgE+cOCD+Wa8Y8M/FD4rX2mC8b4c+EPGzRDDJoPiTZdfMM8xXM
+anHXvXRaR+0B8Kz4ks9A+JPhTxd8INWL7EfxXpgjtAxz9y6jLR4PqSBxQB92eHfET6ppqzApIzxA
+8HjJrQh1uPR9f3zMiIRhgetWPB3g6K68GWWp6K1td6dLGr29xayCVJlPRlZcgqRz1rn/AIheGb59
+MutsUlvc+WRHIVOM/hQB5F8Wf2l/C3geymhkik1O6jO5bZDjdnjqK/Orx9+2T8QNR1NhoerT6RZw
+zOu6KNeehA+YHpz+dYnxzbR9C8feX418U2sd+rsfs8MvmSYHT5Rz36V5nZ3GhT6TDcaT8KvG2r2d
+wQYrq9gjtYpj3I8xt2D64oA6Wx/bB+KGoavDa39zc6lbBSZHiiAd/TOAK7VfiF4x1uddRsbTxLbS
+mPDfZ43ZexYkY54xXEWPxO1zwzrzR6Z8EfCNo1uVMi6nqgLIp6E7UP6E19D+B/2lviRf+Ko9Mt/B
+nwb0uW5IEEOo63NbRMMfMRIIiOlAHT+BPF/xOQrNFd3UIkkU2ofiM9jvBPfHpX234E8bXXiOxey1
+zR7rRNVjj+ZiQ6SEfxKQeh9K8X0bWPjfq+lpqy/Ab4WaxpUsfE2g+OUcyYJyQssKjP41har8edR+
+HYWbxz8APjd4aslc4vNM0uDVYkA65+zyFto65K9KAPqnXtNg1TwvPaXG0FlwrEZGcelfz/8Axn0t
+9G/aB8T6e0oSVbyRQDHtzzhSB9K/XXw9+2T+zZ4xttkHxU0bSL1JhG9nrkT2UyOMcMrjj0r84f2r
+H0iT9rqDWdOvbG/0TV7Tzbee0ZZI5M9JEYcHoR7HigDa/Z0+PHin4YfD3S7fT72M2E2tTxypOpEb
+nZGcA9mr9d/g3+1Jpvi3xrp3h3WLM6beXqYt3WTekjDGRwetfN/7CHwe8LePP2ANXufE+g2Wrwze
+Mbs2b3MKkgJHGmVI6DKnv1zX2r4U/Zw+HnhTxZHq+kaDDb3cZzE+4nyz3Kg9KAPpKORZIwynIIzm
+ormZILOWWQgIqk5J6cVSghktbVETJOcc9Kp+IrG41DwxdW0TbXeMqCvagD80P2jdD0298WanrkKW
+y+bOAz7hg4719Ofs5fE7TPFngCHTUljXUdOjSK4iB6DHB+lfD/7QX9taJruoaBqAkXyJfMR8fK6c
+4P1r339iv4e3dj4Nv/G9/Jum1kr5Ean/AFcanA/WgD7/ALzzG09vL5Jr4B+NHgL41eIfiIp0OCHU
+tFf5IlFwYxCfVh3r9DQuItpwaryWkUsgZ1DEHJJHWgD4D8AfsmtLfWeqfEW9Or3Snc2nRDFshz39
+a+6tD0Kz0bSYLSygitreFdkUUabQorZSKONNqIq+mBVjjbz1oA+XvFfxF0nw7EzXN4iEKTtB5OK+
+BfjF8Y/G/wAUdI13wX8IfC+veJ9R2hb+ewt2dbVSQAXIGAD/ACr6O+MHwBuviFOHh1rUdJlAIL2s
+hGc19E/s+fCjw/8ABX9nqx8O2Amnury4kuNR1CfBmuJGOAWYegGAO1AH5p+D/BPj/wAMyQ2nikRa
+JDPpyz61ehCymBEIkG0DJcdABzmvCP2tf2O7Dx18B/Ev7Tnh+bxfoWvJDHe3vhvXIVEcunxhEyvA
+aJ/LBkwxJGce9fu14x0XRPL0uQ6fay313qEUcbsD8gzuYj/vmrvxK8Gad46/Z38a+D9St47iy1rQ
+rqyljK8kSwlev4/WgDA8B3+g6P8ABnwh4e0wC107TdCs7e0j9I0gQL9eMc9818c/tQ/GDVbLTV0n
+wxBc3l3NP5dvaxNtkuJMckgZJQf0r6I+CenQeLf2BPg7qkgY6u3gzTrbUW6EXUFskNwrZ/iWWN1P
+uprc0v4baZ4d1afU2tYLnU3yPtdzCsjop6qpPQfSgD8qvjP8IbL4cfsC3HxK8V+E9R8Y/EnxD5Vs
+ki3726aCZlyJSF4cL0wcZJHNflh8Ix4k8U/H5tNsYtdvvJMkxiRAjEA4AmJBABweByQeor+pTxjo
+un+I/BOpeHdat7PVNGu4TFNa3AwpHb6Edj2r5MtPgr8N/h3Ndy6FZXuixTNulSDVZZBIPT5jmgD5
+C1Pw/p3w2+KulaUuqXdrBeW6SQNE7+ZYyPjfGxA5jB7E19C+G7G713Vrzw547tNM1bwRJYsNSS7U
+SW7W7Kd8nIOAF+YntRd+AND8R+N47tNEdLBAwmuJ3O+XJ7nOTXR/Gn4d+JdP/YWtbzwpd22n6jHf
+2VlpOlSs63GtXEsywWlkrKwxvmdC+cr5YcngUAfGf7IH7JHjz4taz8X9Z0j4+/Ev4W/AbRvF19ov
+hy38O6i6XGpmCU/OvmZVIkRkXhTuJI42nPo/x1/YZ+IHhb4banrPw/8A2qvjLqGpRRM4tfEV+Xiu
+DtJ274ymzOMZINfqv+zt8J7H4Tfsd+Dfh5a3BvU0OzaK4vCpH2+9aRpLy6YEk5kneVgMnAIAJxmu
+u8X6dZXPh+5tbmKOWCRSrKy/ez26GgD+YT9mzwx/anhjU9cv0XxH8So9ceC9+3sZ57dUO0Ehs/KT
+u59q+1Y4NQ8R/Fa18Ixam8d+I9mpXgcFIU7xRA8AkZGe2OnFeJf8Kq8W/Cj/AILBvovhTWrHT7TV
+rifUIxODtvbVsG4hAx80mzayDsd1fTllpPh7SfGP2m20bzNQhuGaaOclnQMxzznnrnNAHwF+07p4
+8O/FLxDp9l/bemT6TqAt7Kz8t3gS2aNT5rOGyzMT9PpX1Z+yP4A8PfHD4a6x4Z1HRr+WXT9Jjnm1
+LVblW+z3TMw/dKACkZXB2kk5zzX1BrXwM8EfFSW31G8SW11Z4ET7RDc+UxxgAOCGzwK9o+HnwCm8
+A+Fp9E8LS2WmWFzk3twDumuTggFnAHAAHGKAPjT4aa/47+Dvx1l8Im4v49Fiumt4lnB+y3MYPRc8
+KT/eFfpA3jjTpvBUOoGb7HOQP3DOQ68cjj/JryM/Ae61W626tqF1qQChYy5ztGc4Bz2z1r1Pwl8J
+I9Itxb6jqEt3GhwiyYYgdsk0AfhV+3l8OIPHn7efhq58A+HILK+1vQpJdUaO08uOV4JGDXDgDrtI
+BOOcCvcvhH8GvDPxQ/4JBaN4Og1nTrP49/DbxkbeWOdtsws7+72qjK5BeB1lVlYZwy4r9FW8B+Hr
+z/gpBq2rf2dFLHoHw+t7BUl5Ec95dzyv14OY44/w+ted/HvQ/C/hn4t/C/xbqejaV/Yt3fLo+pq8
+KgbWYywPlRkMkq5U9iaAPrL9jLwU/wAPv+Cavw10i8Ahubq1l1K5DJ5e1riV5QCD0IVlFfU8TB4l
+ZSjIehVsiviXWNNubvSDd+ONa1PXtB0uAtZ6X5ax20MajCqIYwokOAOZNx54wMCu4+B/j8ap4hGi
+xWk+naTNAWs7WVt5jIG4Ef3QRn5e1AH1VwR2NI5+RvoaUfdFUdRuUtdJmmdtoVGP5DNAH5k/tXQr
+qnxIv44UDLFbAOQM8n1r139izxXHqv7PEekOcXWk3L20qkYOM5XNcN9mj+IXxJ8bM4+0Ib1xGSM7
+VAwB+lcx8FHl+E37buq+Db92gsNfgWa0APymRf64oA/UCiobV1ms1ZWyCM5qzx7UAJt5p1GR60ZH
+rQB5oFBYE5OPXnNdLIobQ7FAdqMyjA+tYIGOxroLMCa1tQ/PlzDP06igCj4jgjl8UeF45BuAvmeP
+nphD/jXYj/V+uBXBa1cl/Heil8lYZ2x6DIxXcr93k9s8UAfLOnaT8Zfgv418VW3hrwpa/Fv4Vajq
+k+p6NpthqEFlrOhSXEjz3UJ89liuIGmeSRNriRd+3aQAak1f9prwZpemLN408EfGTwLCx2tPq/gm
+7ECt3HmorKfqODX1HkZPSqUzSeWyoxXjggkYoA+Gte/aL+BWoWgvI/iXaWMDtjbcWU8b4z3UpkV5
+PqXxz/ZyFw0svxH0zU5hu2KqTysfYKEr9D9R077W379VmbGCWUHP6Uy28OWULCUWkEZA/gjC/wAh
+QB+f/h/46fDjVr54fCnhT4p/EK4i+ePTvDng27k8zjJUyOioPxPevpTwP4V8feOPHWj/ABC+K/hq
+x8D6RoTyy+CPA63S3U1pLLGYvt+oOvyNciJpEjjQlYllkBJYgr9BxSNEwjMj+X0xuPNacWLm8RcH
+YvJPqaAL9lapa6XFbxLtRVwAa8+8a7k06QxqTg9MV6TI6RozOcCvP/E9wJbCYLjBFAH53fHb4Y3X
+i7WdJ8TeE7m30H4i6O63PhvW5Uylrdx8eXIO8UsZaNvQEHtivID8WvC8lzbWHxc8M658GPiKF23M
+txpslxpV2y8GSC6iVl8ts5AbBGelffWoWMFxJcQTACOTBBB5B9RWVFa+TcfY50MJPPnFidwH6ZoA
++cfC/wAVvg7dygJ8SPB2+JwhY6ksbDA7bsV9A6f8Tvh9DYxsPil4OWA9PM1eEDHv81WJ/B2kaoJJ
+L3SNC1IN90XenRSH8SVyafB8LfALMDL4D8Fyucbn/seHI/8AHaAHTftCfATQrQR6l8Zfhxbyj+/r
+MZP5AmsHVP2sfguNKkg8LazqHxH1mVCtvpfhXSZr2e5bB+VcKFGf7zEAcEmvSLLwd4S01Qtj4U8M
+WpXo0WkwKfzC5roBI0dm0EREUWMBIwFAH0FAHiPwo0fxRHpnijxr4901tD8VeMNXGoy6ObgXD6Ta
+JCkNraO44LpGm5tvAZyMnGa8Z/bVvIbb9ky1iZGMp1eAxvHj5DuJLc9OlfYshYq2CDkc1+d37eGq
+xxfBXTtOLMBLqiRsVHAUAnn60AfdOif8Tn4U2+p+YJ0utLjdeRtY+WDn8a4r4KpJP8Z9LCblEM0m
+Qp4AAP515d+yt4qutb+DGlaZdXD3It7IQhT/AAqFwB+VfSnwQ0dLG+u9SlUAxvOIiepBkIH6UAfV
+W84POB2rxv4yeJx4f+EuqT+ZtkaMxx4P8TcYr0s3a+QSzEfjXx9+0JrP9oTaPoolyjTGSVVPp0zQ
+ByfwJsp5tV1ed1LISvmHH8Z61yf7UGj3mg634W+IOmq63uj3auTGMEr3BPpXuHwKt47XwnOzgB55
+y+K9I+Inhmy8VeBL/TbiFJ4ZIiNuAeaAOw+Gviu28VfCrRtXgkDR3Nsj4J6ZHI/OvQ/MFfn1+zn4
+rk8F6trnwy1u5ZJrC8drIynG6JjkAfSvtM65B5akODlc/e4oA7EzKD1FMNwgNcI/iK3BO6WPHfD9
+KzpvFtlGfnuY1696ANlQW2kdDWtprkNNGccgEfhWJZyCWwjcNkHpitmy+XVYm/2se3IoA5LxvdjT
+tSgmLFVDeYTnHCjcf5V6Jp9yt1o8E6n/AFkSkV5x8XdP+0fCm/1CGMNewrtjBOOvek+FviWLXfBA
+XcBLEem7PH/6xQB6pTTtbgioy3ynHWkDYGc80AQmKMyHIxj0rPupdsfyk4qzNMVjcnGa5y9vMAAD
+B5oAhmuQsuWLYBya7PTgselRytw0nNeVNPLcXgjHzMeta/jKXUJvhrJb6bczWN3JaNHHPFwY2IwG
+HoQeaAOm8QaqkFiMH5jxgHp6V5zrOqwiwhikLnzCdxHavnX9nLRv2lbfwr4z8M/G7V7bxLo1hOh8
+Ka5cbFvrhDu3JKVADAALg4B46nNdPrN1qi6w9lcKsUsTfL5zbRj19xQB18dul9NIYgvykAkZ/X0r
+Onl2aqLCeGMSIMlycg185eGNK/aGt/2ztf8AE/i7xRFB8K7a3aHRdEsI4xbzqwAEr4yxb6n8K+gd
+RlF9NBLHuVo4/vEfeP8AkUAdHbqrwrIg6HoOlasKDzBgsuRzzXOWk5eNNhZcD5gPWuhiYpGrj5z3
+BNAF/agTaS2fWqUx2nJOFPGR1zQb2KRiELZBw2V6VBIwklGG3KOgI70ANLBQS21UXhjux9TX5P8A
+7cXiO0vfEXh3w6/mSs9z9okRTw2GAHP0Jr9RNcv/ALF4fubjjcqMB7nFfhd8e/FNv4r/AGx3Essl
+5b2t9FCkZ5AU7QcY/GgD9Fv2U4WHh/xZPaxmLyVZbJTIPkXbx296+m7/AOJvh34domjXd5bRXgiW
+SZTJlskZ5A9+awPgj4J0Twj8MrS30aORjqMQOZCGZQcEknHoa+R/jJ4P8S+KP2i/F2pR3E0NibwQ
+xiMZIVVAGP1oA+2bX46aHeaC0ttcmX5SQea8fv8AUJPFfjVdRuI3eLqpXpjtXiOheDda0vw3bx3F
+2zKflGVwSp9R619BeGNOMFgo+YYTbgd6AJ9M8cJ4PYwSLweVABB/nXuXw88bw+MtDklAKujlXUnu
+a8C8QeCP7cu43MbqB1bPNegfC/w/J4W8RzRR/NbTDOD60AeD/tEaTfeCvjVpfjTTA1ss8YhmdO5F
+VbP43a9eaPAIJnZlXDlVzX1P8e/CSeJvgnfCOISXMEZmiJ5ww/pXw78ItPi1fU47W6jVQsjRyAdd
+woA6+b4oeK2DYeVgx6KORWRceOvFl4JCDcljxjJr6Tg+H+lrhvs6cDnK9ad/wg2moxbyUAPt0oA9
+y+G3iODxL8MdF1a1ZZLa7tEuImBzlWXNekxkpMjDqrAivz//AGK/F1wfhXqHgPWZWGs+E9Rl02dT
+/cVyEI9sAV+gEeSgYtxQAeNbBdW+FWrRkneLRpUwcbioJx+lfKPwQ10WPxIvLFbiGO0m5WEtyAcn
++dfTuvambHwfdrI3yPC6IxGQuQea+DPBkk/h79oi0t7qS3kzuRWCcuoCuG+g3GgD9IlcNHu7VBI+
+AeaxdD1L7Tp5Z+jn5SfTtitWcjqDxQBk3cxAZielcndtJI4+fac4HvXQXAaW48teSetT6do6Taj9
+ouMCGL7qnuaAH6LobQwiecAu3PPpXVNaWz2QjmjSRAehqGW7VQVyqjGMVk3eqxxxgLJlu/vQBmeJ
+ruPT/D83kLsiij3bQeuBXxd4l8d2mqeNZo9sCXUWQBKeCB24r3vx9rc03gu/SOOV3MT7lA5AFfCW
+g28moa1qs9zAIriK93QkOcquOQSetAHsGk+Lnkmis53jks5hveSInauD9017NpTWE1sjRliNgbbt
+xg88c18369p9jpi6bcyLkTtiMJIQu4jjOPerXh/xRqekSzTXRnnRo95CNvLkHG0enWgD6aitxHdN
+Mny55welaMDliWOGUjGK8dt/iEspjR4HgZQBJuHKk9M12uk66l/cI0MgRGcocj7rYGDzQB10jhYy
+Q7AdCoFQmQmLaoGCOAPX1oM6l5AQpOOF/rWNc6tb2FrJcSsmVUgJ6nFAHjXxz8XL4c+H+qwRTJDc
+R2jujHkbsHrX4W6Pcz6h+0D9v1BozcSXSSJK0m1Qd4AJz25Nffn7S/xVs1tfEVib5BeMoEdu5wGA
+5P5Zr82fB13Pe/F6zinRpruW4iW0VCCOWAXPbGaAP6aPh9FDY/C6xYTGeOG2AEqsCDhQDgjsSK42
+40OKe7mufKV5biVpHyOpJqD4YyX0XwVsLC/uYLi/EYS4+zsWSIqACBjg/wCNeg21t8hkYEKoxz7U
+AeJeLLWOzkihVBkEZA7VveGZIWC26bCwAPJyayPEkjT+MPJTEmSQSQTiul8I6LLFqr3Mm1lzgcUA
+d/Dbj7OuEUH1x1q0irHdo4UKc54qZuE2jjFNwSBu7UAd3IsWq+E5IpFBV4yGB7ivzbFtJ8Pf2vNR
+0xgYbCe6MkBx1zX6K6BdKY/IbpjGDXy/+0x4JIgs/F1jC32qylzI6ngr3oA9osZvtWkW8y/xLkgf
+Snyjgj73qK86+F3iFdc8A2ZLbpljwxByOK9MnA8rjg45oA+Fy8/we/4KzQOSYvDfji32njCrdRk8
+H3Oa/UXTLkXOlRvjhlzwa/PX9t3wrej4RWfjrRoHfWPDGpRajblRyFU5cce2a+t/gr41tPG/wX8P
+eILOZJIL6xSYAHJBI5B9waAO88Ypu8C3eACwU4z06GvhdZ7OHxJC8kdvHcacSkcu7LsG4fd+lffH
+iGAXPg+8hHDGM8+nBr84fEyz23jzUYtPhDPGyuzY+8GfBzQB9l+GfFcK6NGzXILsqeVG2OV2jkV6
+/balFcWO1yiOQAvzdTX5/wDh3xVFe6jLYsXihkt1jgBPzxOh5Of7uK+ltE8R+dYCNJDJNakLPnsw
+H9aAPahDh5JASMDr6GrWo3/9nWixrt2hNzMe3HJrM06+GoaArk4fHIrjvHurvFo6x20ck88oUKB6
+5xigDattQm1GFpVJdNxwcEB/oaR3s4pB9puVY5+4vJX2+teQ6f4c+Md9qdoLOXw9b+GXB+1wSXTp
+dKexTClcevOa9CufA3jRrURabrOg6MeMO8T3EmcDOTgdeaAK+r31mbCSEaZcSrKfndmCkj6V59Jb
++FNKL3EumD7RKxMpYIM+nTis/wAU/Df41zazHNB4u8G6nZRkma2ms5YHPPADKT/KvNfGnhn4z3cN
+vp9l4X8LPCp3yzR60wIOOmCm40AbvifxFotxLHbLo7XtuMDEJH7r0OK81nvPD5tZbYSjT33kKr/u
+y34j0/rXlV38LvjRfeK7q/uvFsPhywcKBYaYokIx1ZmfBq2fhNr8unSwan8QNTvA0ZCbbdGYMeOO
+M0Ad+1tdRadcPDi8jbDYS4Jyv+93ru/BkE1rpdws3meaAssblicgHGK8e8G/BnX/AA14Unkl8e+I
+NQnL/uYbjAjiXPQjFe/ac/m6fFAAGukdYiVXaCCRk0Ad54p1ZNC8H3GpMIUl8jKZPGcV8E+Lvi3d
+Jpup6tJeCODHlRqkhI8w54x+Br6F/aN1y7svhbJa2ilpSmxUH8bHI/TGa/LzXry7bwtdWOozNBZW
+YeZWjGfMcDnr6ZoA+fvHPiLVfGXiy+v9TmWVoGkCK6YEkZruv2cfA8HjL4sq1/Oum2VraNcI6AF3
+bdhVGa8t1xoF1O0061DS7o/MXcPu5Hc19ffsq6ZE3imGeeGNLgwsjxbcAgdCPwoA/XrwVYpYfD7T
+LK3thBHFEFwrZz6k+pPWu+v/APRfDjSDG4qc5rnPCke7RLIKP3eOlWvG18tp4VfB7dB9KAPKrErd
+eJrlmJyrZznPfpXrekWogsQVHykZryTwjBJI/nMpyzZJPWvdbWHbp8SgfMR+lAFZlO4EHGac+DFx
+96pMAscimBeelAFywlMGqJzgN39K1vGehWfiX4b3unzIksc0JU7RXOKxznHI613mkSi60jY3U9c0
+AfBvweu5PDXj/VvCt3K8Ztrlkj3emTivrJk327OGBGBj3r5W+K2nS+C/2pbLXBGwstQfbIU4APAr
+6U0O/j1DwxbXCKwXyxgE8mgDpfid4Zg8SfDfVtNnQSR3Nq8ThhkEMMV8V/sS+KJdA1Xxf8IdVd4r
+3w3qMi20Uh+Y2zsSp96/RbUoBcWUkbKXyMH6V+X3jK1l+D//AAVU8GeM4kNtoviqJtM1F+ieaAfL
+J9ycUAfqpcos2jzgdWjOPyr84viPfQ6D8VtWhNu11cXtwLdsEI0S/MwYDoRkV+iOk3X2zw/HMGD5
+HGPpX5i/tXRzaL8evD9yqv8A2ddBmu+dpkCg4QHqCT6UASaVdWcmvPLDbra2N4gSBwdxDA4c+xr3
+LQdWKeMriDzpHiuYVdiOnHAb68V8Tx+JNUvtVsNTsrYQW1w/krHPJt278geWPUGvqDRIJbSW0S1k
+23SRmOWRyZBhTkqSeh68YoA+xPBmpi4t5rfuhZSexA71uPp6ahrMUMm8LG2c+o9K8k+Huos/iWFY
+GMttIm4+gPfivfLWPbfh8+tAHR2sMNvbBEUKo6cVBO8Y5LHHSmtOFBBOfrWDqV0PIfnbQBzHinxT
+p2kWDtdyTfdJ3BfSvnfXvi3oUa/ahcTrHK4QOy/catj4ntez6NPFDPHCJU+QnqOa+NvEOmz/ANlx
+6fJfzqEuPNmcKQHHYZoA+hh4v0HU5PObzpYnyBKHxkg9h+NdLBLpk1ruto4Wdjxg5Ixivm/wt4fh
+1CSFXkn8xQfLKyZGD65719AaJottp/lli0kkYG07uOev8qAOyhjQ2o/d8bTuB5oiiX+1o59mY/L5
+Zudp+lRK7iUgSgemBx+NWlDfaFLs+4rhNnAxQB8sftEazGusWcbySSQrEwKK2CWPRv6V+YfjySWG
+Yx+aQiR5njL/AHC3O0+ua+9v2ntRT+1biAxOzW6eYHj6luyfng1+YviJdV1DUHnurhpzfDz7nDgi
+NVzt/KgDkbaaDU/FEUlxujkW62xgNzIu3v7V99fsytZXPjVbR5Zlmh3Kh2fJJ7cfXFfnxClt/aUl
+ufOEKSrslXh2YnkfSv0a/ZC04z/Gv7OZAbGCAyMBgruYDCj6UAfrpoFr9m020jCgGJACo6HgZrjP
+iBOJoorZCWZ5MBRXo1viNlYHgj9MV5jqpS88bIOGQMePSgC54asDawwxSZJUDJr0xF2RAljkdvSu
+a0eDcWwOAcDPtXUffkfKHOKAKLYy2PWndQMdutSeWAOBn2NI20oduAe+KAISACQOAeprd0O4MN0s
+TO23HTNYgXMb5GafBKsF5G43HHWgDhf2hPCA134Q3V9bRhr2zAmhYL8wxycflXnPwV8TNqnguG2n
+fM0Y2sS3PBxjFfWt/bRav4JmhZVKvGVOR2Ir8+vDjS+Af2kNY8PzqyRSzGW2LHqCelAH6SEFgcV8
+EftreErq+/ZzvfEOnRsdU0G6h1O2KDDAxyKWwRz0zX33GteY/E3w9Br3w01XT54/NhngeNwehzxQ
+Bgfs/eOLXx3+zp4b161mE32uwRmcHkOFwwP418kftz6Y39k+GdYgVfOsNSDDPAIIzj6VS/Yl1u68
+H+OPiP8ABzUXKz6DqrT2Ubn/AJd5ckY9gRXoP7Z1otx8GrK52sdl6h+T64oA/NDwf4iiuvHOiWd/
+dCRv7UX552YeWGYnCc4HNforZGax1f8AtC1aE6XbttmgY7hIzcBwevU81+feg+EtQ8VfErw/aaHo
+V9rlzBdrNc2ttFvZQrY3SEcR/U1+5Or/AAg0O+8DxQ6bbJYzTQx70HbjJ6dT2oA8U+Ft/bx6rZwi
+Q+fkh0ycqSx9e3NfWNugDbuvH9a+WbH4ceKvC/xMfUGC3OjtKJC4OGjKjA+ua+mtMvI7iyjlJA7M
+O+aANOaMueCRWNeWEsqsvJBrpUZWRivrVaZwEOaAPLdY8F2F/EZL6JnEa7cZ9a+b/iH8PNEh065N
+v9raAYMgSZsDHP8A9avsye6jaFy2CFGCT2rwD4kavbwWrxR4lkZxny03GgD5d0fQpNOliubZJljL
+gMj/AMJPTp2xXrdm8n2eMNPbICcEEHJPtXCazr0UUgtonEUk0m3KgqQ3b6mtjRmuDJFJczuwiOJN
+2NzH2xQB6bbDYrb9wRVznGQa0lkDEfO3loQSwHQVjfaolsdyA4bAwWxj61C+oQxRsjMAmM/I2c+3
+1oA+Ff2ndatNK1y8mm8uNnm+Qq3zOW+X9OtfnLqek6tqF2iaetxcTXbm3SCIbyEH9T1r9M/jD8C9
+b+Lv7Ruj3iT21r4RjieTUYizedIwxsAA4r6p+FP7P3gvwZLBeR6RZCcbSH27juA9TQB+O+s/syeN
+/Bvwo0bxprVheQW9/M0sVqkDSuAo4LYGQD6V7r+xhL/Z/wAZLuzuo3gl80MPtEbRkg/w/N3r6w/b
+2+JfjD4d+FvhpB4U8RXHhu0u7qZL8wTKrOileNpHIr4F8EftvfFrTPGeq2Gm3ui+INOswsrw6vYx
+zNKc4wGxuUe+RQB+5Wr3X9naA15kLtTOPbFeXeGp11HX7i68wMHJC5PSvMvDf7Q/hb4n/seat42u
+3svBN3oUiw+I7S9uh5Npv4WZWPWNjx04OR2qT4X+KfC3iK2kXwr4q0bXZly5SyvVkYepCg5xQB9X
+aVGiwFxgnNbBAy3OOK5bSzNb6fHmQSnp93pWtDdgHZN8o9fU0ASgHBNRhFEJZvu9zVtWUythuoqF
+bm0kumtkuLSSZOWjDgt+QoAqsdm3ByT37UhVgDtKlvSrLR7pNzfIPSm8hj/Cv8NAHVaDdebZ+RJ0
+Awa+Nf2oNBfw/r+h+OLJTHIk3lzY/iBHQ19WaVcNBqAz909Ky/jJ4Uh8X/AnXNO2Bp2tW8okdHA4
+/WgD1xO9ZfiKXTbPwxdXWq39pplise6a4up0jjjHqzNivz4/bP8A26R+z9q9r8PPhxpVh4o+KN2m
+6f7XL/o2lK33GlA5LEdE7V+Efxk/aa+LnxU8Xxad8QPFmr+OS9xldONx5GnxyMeEEKYVgP8AbzQB
++sPxP+NPws+GX7dmifEbwb4x0Pxg01tJZa5pXh66S6nlXIKE7SVHPrxXG/Ev9rHxf8fvGfh/4R+A
+PB9no2oa3qMcFp9snF3dn5gXkZEysYQfNz6V+a2lL/whngWSbybG31K6XNy1rGIyncJkdcV9f/8A
+BMeyh8W/8FPPEHiS9jDtoHg+4uLIHpFJLJHDn67WNAH6K/E+20j9nv8AZLuvD/hy6FrfR2IfWdeE
+Q8+6cj523dgWzxX6UeFbpdQ+Ffhq/SQyLcaVbyBv7waNTn61+O3/AAUhu7iw/ZambzWhtLm8SC5I
+HUHmv1i+D0zXX7J3w1ncfM/hmyPPb9yv/wBagDq763WSJwy7lPauFlhk02+M0Ct5ROWA616XMmSR
+7Vz9xaB1IYAj36UAUbTVIZYMq6pxnHenXeoRrACDnIznOK4fWbC9sbuSa0L4IyQvSvNtZ8X3sFg6
+ywtvXjaxwGoA7TXPFFrb3HlzMQRGSFEn3iOcV4f441q3vLCK4sZYhIcb1Zs5JHSvO/EfiW6k1Z7s
+28ylFyux84Pt+Ga87k8S3F5fBLuXZZQtuQLF3PYmgDtY4yZDd3M1u7AkeQ65Ue496ty6sselxiAM
+v7z95KVwVXuBXDNr+nC1inDl3CEhc8nnjisr+2tR1TUUt7YM8W87jjqcDigD1r/hIrh4ooUAK9v7
+23sasRanPPNJHCTPgde34VwukaJqsl0skjh18vGxh69q9k0DQswmNrIKFQYB9fWgDpfDGlCGJp5s
+jIBI7Zr1iyEvmKCsSQBflb3NcvZW7R2cMTDyyi9u/tXV2bEWwfGMHpQB+YX/AAU/8H3Wt/DD4W6x
+BftbLb3N1azhT8hUhXBIr8gvh/oaWPjnVz9oaYG3QOSdoZs9a/eP9v8A0aPxD+wlqSrcfZrvTrtL
+yJgOW4KsoP0Nfhh8JUc3OoXs9uDc2swt5A5yGwaAPur4C29pqg8d+CNSMR0fxN4M1Gx1FZB5kJxA
+0sRbjgq6Aj61+Tnw68f+Lvhr8SdO8ReEtavdK1eykBBgnKI+1uUYdwcV+lFj4kg8EfCrxbqYlRLm
+fTbiC3SEYyXUgkn6HH4V+UEEYS4ZZGIDMSxznJzQB/SP4A/4KE/DPVfgR4d1TxXpus2viGa12X6W
+UO6MzqBu2+2c0/X/APgot8J4tah0vwz4Z8T+JNVliB+zIqIVOcbee/rX4h/BrS7nxrp+raDY6tY2
+eqWIF9apeviGTJ2spPbjmsvW/FOn+Cp9T0nwrfLqHiu53RaprafdhGSPKtvT0Ld6AP04/aQ/4KMa
+xYeGo/Bfw605dD8RTRg6tqYdZVsgRzEuOsg6H0Ir44+HP7WHxH8KfEi18SjUrjU9QglEs26VsXce
+fmDZPWviv7TKnmlndwc+ZHIc5J/iPqau6XevbzQE/vEWTK/U9aAP67vAvj218f8Awa8K+NdMGLHW
+bBLtR/cLDJU16AsjeWn8dfIv7G82m3n/AATX+GT6Xem/ijs5EnJ/5YyCRtyfhX1lZfPbbd/3aAJ0
+fbcBuhU7jXokSpfeG5YmAcMnOfpXnz4EeW78HFdl4buM2rwvywPP07UAfyzfHrXr3xH+3d4v8Ta2
+7SXc3im7juNy8hElaKNefRVFfLuiaeH/AGsxBPHGoiunlRW4XoSDX1l8fLS21r45+NtZ0dQ+n3mv
+3dxZSKeiNMzKSRXzBr1tdad4z0jxorK8BYQagy9YHPGT7GgD1T4jqf8AhDHuol3yfOrBex7mvuH/
+AIJBukn7QPxjuCokaDQrWFJG7K07HH0+Svh/XbpdY8IRfZwPKIw0q/MrDA55r6n/AOCX3i618Dft
+++L/AAdqUyQDxXonlWRyADNC29V57ld2KAP0u/by+HV18QP2CfG1jpVnLc6xYW6ahZFOSWiYMRjv
+xmv0D+DOsafr37JPw31fS2RrG48OWnlbTwAIlUj8wa8x120ttY8P3CXiK1u9u0c6OMkgggivIf2L
+vEl54RtfF/7PXieaUan4WvnuPD0sp+W70yZi8ZUnrsyVIHSgD7ycbhis6eMZJrUPSs646Hgn6UAY
+09usyuGAYY6E15H4v8KQX9nMPKBOMjBr2GRhlsgjisHVIhJZvgA/LQB8W614LaO9mjKOseNoIPIA
+7+/WuCuPAdw2IbeZpYi2XA44/wAa+pvENnt1AOMAbeSa4janm/u0VcNyaAPG4fhpDHcCT7wABWRm
+yy+oNdXBodjbTwrHbRKoH3k+UMR613JVSXLjCE4wPWgWyO4XylZO/qtAFG202FEaOVQUIGwBs4zX
+Z6RAIoEXDu2OAwxVCGFjGoUg7Tg/LW/apsjVmZcZ5KtmgDai+VSAqJKRkMTwKd9ujtUd5SUXaOpI
+rFu9S+yxSMyL5XZ8818b/tCftFWPgTw/cQWd2kmqyLtgj80ZGcjO3+VAHgH7dnxmcs/gC0d5EaNZ
+LlY29WIVcevtXw/4Z0X+yvC6WYEUdzK/n3DgfxZztP4cVBql3qnifxbc+LfFDyXl9M7GCOT7yqef
+MI/QCpbjXodP0J3uZPKIjyVbG4fWgDlPit4vjtvAE9ujqpkiaCMFcDOMn/Cvie3VmkWOEMXkPyv2
+X3NezfEPXE127t7O2aN7VGLu7OBgkV5za28EaNEkn7z+GQj7w/pQBt2WqXOheGr7SdFjSG4vlVdS
+1DPzumeY0/uj1rn4U3bdxL5JABU/KetWktSS6EED72d2SfpS7UKOY3Ykp8qHhlIODmgCoqSbvMy7
+v/GMDFRu5S4RQNzHk7R0rdVYvMCLtQKP3jA5zWRfaVd395tsSXK9Qo60Afsr/wAEtfjZAw8T/AzX
+Ls/a55W1bQGcj958oE0S/QLux7V+y0DtFcbQm2P1Nfy8/sk+FviP4d/b1+Eviyx0PUXsLbxFDFez
+oQUjt5PkkDeg2sc59K/qLuUQyyrGxaMv8hHT86ANLKlBtxir+iXBg1rBcAP2FcebiaJtpJbFP0q8
+mk8VWW5WRGJGAOaAP//Z
+
+--Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1
+Content-Transfer-Encoding: base64
+Content-Disposition: inline;
+  filename=avatar2.jpg
+Content-Type: image/jpg;
+  x-unix-mode=0700;
+  name="avatar2.jpg"
+Content-Id: <4594E827-6E69-4329-8691-6BC35E3E73A0>
+
+/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/b
+AIQAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgIC
+AwMDAwMDAwMDAwEBAQEBAQECAQECAgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD
+AwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgAwwDDAwERAAIRAQMRAf/EAJ8AAQABBAMBAQEAAAAAAAAA
+AAAKBAUJCwYHCAMBAgEBAAAAAAAAAAAAAAAAAAAAABAAAAUDAgMDBgcIDQkDDQAAAQIEBQYAAwcR
+CCESCTEVCkFRIhMUFvBhcYGhJRfRMiMkNEQ1RZGxweFCUpIzZGV1JhhyslRVNkZWZhliooXSQ3SE
+tJWltbYnN0c4EQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCZBQKBQKBQKBQKBQKBQKBQ
+KBQKBQKBQKBQKBQKBQKBQKBQKBQKBQWx5emeOta98f3VuZGVrS3lrk7O61M3NrejTkNdvqlq5Xcs
+pkqezbKJjHOYpSgGojQYANyviVenfgaW3oTEHKb7gHhArXoXlxxc0JvdZsUodbY27cikSppSvZb6
+gOUl1AVTYEAE3rNNOYMEm4TxW26yTqpg2bdMRYvx3GHATJonJZOgdJXPmVPy8ntt21edrcRurrg+
+kBbqG/btiOmhu2g8CSnxE3VNmDYytxM6oowtaAL65dFoZF2pY8GAnKJnQxGw1u+U33wgBShrQdPM
+vW+6qLGtfVybeFkxZdflHtN609Xmt8RN1wAAoEY0DsgWImVPoH80mt27Yjx5deNB3rFvEh9WCOub
+WsX5yi8sQN9m2nUMsgxLjT2N0t2xKInXLGqMtjv7ScpdBuW1JDDqIjxoM1u1HxW7M+SWMRbd7g5F
+D2NcYqF9yhixwXuqdpumJpad1sJcvWrrqAL2nryJFNy6Qgie3bOIBbEJRe27ebtc3dxoZXtyzXCc
+otdq4FlZYZXC4kfG2+Jeb1DtGXiw3SJru6dgX0tvXThrQenKBQKBQKBQKBQKBQKBQKBQKBQYSeph
+1ytsXT0FTA0xbmac93UN28mxxE3JIRujl09u57JencgAb5Ga3cuFD8XtW7yoxe0pO2gg0b9+rZvP
+6i6qylyO5+7GLmFVfVt2OscJHZsiSQ94BtlUPd4VKpS9LCWB5fWKrpihx5Sl10oMSIqR1HUR1146
+9uvl19HtoK781Q/2n+5QUH5z8PPQV3/tnw/71BXJvxT6fi8/Z2UHJ4tFJZkSTs8Lg0ed5XK5AttN
+zKwMSG+4ujktvmALSZGkTW7l67cMPmCg9o5B2cdQzY9djuRJlhzPWCbqv1LixS1K1SNi5DEL623c
+7ybAKWwchR15bhg7eIUEifpY+JVkTE+x/BHUDXGd4/fBIzR/PlhKPfTSpADWbBMhI7YFBajOYCBc
+Xk1ukH0jEENaCbFFpVG5vHmiWRF7bZHG35Cncmd6aFVpa3uCFVaLesKE6i0YxTFPbOHAdDFHgIAI
+CFBf6BQKBQKBQKBQKBQKBQKCMv11OtNY2gs7ptZ24OFh23JylmEsjfkVwiqzixmcieqLqWyJ+aVr
+rVz8DZH0rIDzCADpoGPboreHMkW9Qj5u96liTIzRAZUrtOcAx+rdlDJN8sqV4FWLZpLHS7656aIo
+BTltprRQsqlxhMYp7dq2UboTacK9NvY9t+xPewpjHbfjVqx8sSqEjo2OjEnka55tqiGIoO7vT8Dg
+7OF64U2nMe8IgHZppQQQfEJ+H6S7L7DtvK2nWHl329v8l5cjY6BECxVhlwergijcm5SjtgZRAlq8
+RslNdIUyC7ct2zmOU5TAESX8z+HnoKJL2j8v7g0H5w/JPj+P4a0BUq7ePw+nz0E9jwj/AE2Udxsm
+fUVyrFrV4664rx7t6tvCIpwt2kl4PfOeN1tQQQAwqLZG5IoL2CRTyj5aCdEub0DolvIXNCjcUSm1
+csKEa5NZVpb9m6USXbN5OoJctXbVwg6GKYBAQ4DQRr+rr4dDbZvVgshyTtfhUK2/bqmlOpdWVfGW
+61GoBkdXbIa8ZjmDA02SNTcvcTl5bTmmTkulum1vhcLxKEYDpCdRrOnTO3XOWwPeXdeI5i1NNluP
+npvl9+6f7IJYF8bCBzQq7pzFtRZUpOT1glEbHs90t4no+kAT+kaxI4pEy9AqTrUK2xaVI1iS9bUJ
+lSa+QtyyoT37RjW71m7bMBimKIgIDqFBU0CgUCgUCgUCgUCgUGKzq79Q9i6eO1aQTpCpRKswTYiu
+KYejd2+T2pZIr6fS++GSAB791BHbN4t+5oXQTCUuvGgjLeHG6cl/qPbu8m75N2CZVkPHWGpOkfzp
+5OQ65Bk/OUgv3XZsSuYKRPacGKHI7IrlScdSGunR2TlNaOctBsj7Fiyms2k6azaTp7FolmxYsWyW
+rNmzaKBLVq1atgUlu1bIUAKUAAAANAoPrQWeQR5hljI6xmUMzXIo6+oFLW9MT2gTObQ7Nqy0awrQ
+OLestXkqxIpsnEp7dwpimAdBCghudSfwl2NcuSCUZd2Fzdpw9InY6h6XYKmdpXexyudLXOptJYZI
+khVLjEbKm9qS2lUWVKW2JgALlq2GgBHxhPhiOpE/7as/Zwk0eYsbTnFze9OuOtvjqrTOmSM0I4+7
+LrMqWoAQqLzbErZGtEYGg1s4g/Dy+QxRMGFHG+2LPGYXlHHscYPyVM3pfbC8ibmaGP70pv2DGKUL
+5CIUN7WwJhD0/vfjoJaPTU8JZknIl6N5R6g0hT46xw4NKd3SYThjlfPlRdfUjbuWEcwcrjeLNEk/
+sxhNct2rqtYU/oHt2h1Ggnu4exFjvAmL4LhrE0ZQQ7HOOI22xSIxxtJyJm1na7BbFggnHW4pVXhA
+bl+9cE12/eOa4cROYREOyaBQa+XxgGxhDCMr4i34wtuOmTZbtWsW5XOmKIWPfOKNhbkQfLnIGltS
+7RhMZKc3DmFvKP3wjqF48Md1K5PMweNjebphfdL7SzLJHgd1kLlcV3lSBtU2SOsGa3NUIivsJm+9
+7Witc4mLas3ilDQtBMqoFAoFAoFAoFAoFB8VCiwksXlSq/ZTJk9s96+oUXCWbFizbKJ7l29duGLb
+t27ZQETGMIAABxoNX/1p98jjvl3mzt7aXE9/E2LVazHmLURD2DprjWzq7tpzkIDZExDqH9eUTibm
+H8Fbth5KDYR+HYwy14e6SO1m4lb7KN6ykySDLUpv27RCXXF1l0lde71ag5fSunLGkKG2UREdCkAA
+4aUGbugCADwENQ8w8aBQfO7cC1auXRLcOFsh7gktWzXbpgIUTCW3bIBj3DmANAKACIjwCgpCAS/e
+IIDp6kx7ptPKY2gAA/JQfidpa0hiHStremNaKYtsydGnsmtlOYTnKQbdsokKc5hEQDtEdaC4UCgU
+Cgj5+J3xEqyp0kM0OSBDaXK8US7HGTDgYgGvWG5FI7MZdFCc2giQydJJxunEP/NkNrQau7EGQ5Ji
+nJkVn8QdlrFJog+tr+yu7ddMnWIVzcqtqLF+xdIICUwDb0EOwQHQeA0G2w2gbi4dus254tzhCXhK
+8t8vjLed1OmuWznb5OjTWk0jaVZLf8wqQuhLgCQQAeUSm00EKD0rQKBQKBQKBQKBQYlut1ubXbWO
+nTnCZMTiLZLJkhR4tiiq2cbaiw6zk9xsNfTXwOT2W/aRet5Lo6gS4YvDUQoNW46PrQivpk61ztGW
+rroXVgCcTnIa+fUx1BilMW2c4mEePy0G622Iw+O4/wBku0OFRK0isxuM7aMHtLOVuuWryE6NNjaN
+lKoTX7BSWb9tUYRu+sKABcE/MAcaD1dQKBQBDUBAfLw830hxoLQf1SC6UeNmxasHualtmPZspLHK
+a9bEpREbYgI6lEA8/wAlBdSmKcpTFEDFMAGKIdggYAEB+cBoP4vXSWLZrlwwFKXzjpqI9gB8YjQW
+2y4GG4BLhP54/wCD5jgQxfSIF21y6CTnT+tKUQ5uY5y3ADiUAMF3oFB4Z6m8KbMh9O/exEni0N9v
+cdsmY1N4gEC4cDssId3xNdtkEBAbthU2kOT/ALRQoNL4nD2NYIeYdO3X0QEQ7aDYIeFmyndlW0TM
++MxMa8kxpldsdm9SJtS+zz6NlOdKUv8AB9Qoi57g+f11BKBoFAoFAoFAoFAoIpfi152WMbI8KR0i
+w1hVKc33r9pKUwgC20xxFyC6BygIc9uxdd7RhDjoIgPkoNcua4e5cG4cTHOY/MYREREwiP7NBvBe
+l0uXOXTd2IrHJEsbV9zaXgQipA4Wrllakup8ax1ONhTZugW5bu2wtAAgIBpQe76AIgACIjoAcREe
+AAAdoiNB8Qv2xONvX0y66lABHQOYQKOoAIemAagHaNB9dQ05tQ5dNddQ008+vZpQWNUrTXb3qzcp
+xMnulKU9/wBnT3Ut/kC8e5d04h+D4AHk184UHztPyG1rbOJilAR5TAUTfMIAGutBa3dxBbb5bHMU
+SCPIUeHMP8YQ837lB/aVVoOqvUBDyhpw8w0HJUd8bpClObU/IFwoiUSH9UcTerLeIIiJVFsoAFzy
+c3Zp2AFbQeVN9hil2R7wzHHlKG13PomNygflKGKpXqPIPA+geTy0GlBWffD8o/51BNM8JS9ONtZv
+Djw3rFtoVo8av1lvIP4a2tTukyRmv3g17RtLhL2UE0WgUCgUCgUCgUCgh/8AjCGlMp2p7Wng6stt
+W2ZolSROiHTnVWnOKoTqb5fLokFvIA+T8JQQcNnWIVGfd2G2/CiYnObKObcaQq9+CG+W2ifpc1IX
+G+eyACNy2nQXbhzBpxKUaDelxliQReOMEaa09lI2x9mbGVAmT2rdiwnRtiOyjT2bNm0Utu1bt2rI
+ABSgAAHZQVaxWFg4FtiQ14SGONsboENyWiX7xdAMUwaXj2BII9oBqIdlBVCYR7f2KC3UFOqt3QKJ
+AuH5f4uo6fHwAaC2+y+16ir7POH08KCt7rS+cP2A+7QPZE3mH6fuUH77P/Qfh/JoKyg/U14SXA5j
+Dym4DqIjp5vpoOJ5ax/H8uYryTiiUnvkjWUIHLsdSAyQRBWVmmzEvi7mKbTiCgErocCeY+lBpZd2
+m3SZbUdy2cds02Xd9SHBeUJjClr4Hpd7g0iItEv11/3gYKCVR4R9vtlf95DlYDntCz4vT+u/j21S
+6Sr0oecdCGPQTXaBQKBQKBQKBQKCLb4rKIR6QbNMHurtaLfcmrOV9sarImEDntP8JfAXmt6CHpWr
+jYnNrx0oInPRCxoz3erHsAI1K7qhzJuIgkgMRSNs9oGZg1dH0pScgBqJPRAR1EAoNxGN843Qt8AD
+yiAcR+5QR1Ooz4jzZhsNnMrwcwMUv3K5+h7TpJofj9zZWSC49lP8GLZJys73rgRyQX7YahbbrT3d
+IA6HKU4CABHpk3jHd6QKwVx3aztNjbWIAX2GSzLKTtr8Yuhfcoga/EAUFc2+Mf3frA0DaXtNeOPa
+15IyeI/94pgoMqnTj8UhjfdHlCC4J3UYSLt0nWTJaywqE5CiEyPK8SvElebxGyMM0q942Zhfcf3X
+125gtc4GDm5dRAOYaCWpQUiVL8PN+/QQ3OoH1jOo9uN3DZS2X9IzA2ZFkh27zyXQTN+VIdjxld3P
+vVnezNjQDPKZ3rAYBH9CmMIupROIecAAKDBpmRq8QgjUShFuN3vTrESOLNQOMp+0bffhSJtLQDqB
+XMAeAxfNRLHwAA/RDpp+1QYiWzN+6FVOu8nffbJ2SQoBB0993Leq8urZ3v8A1QeBzKZn0+IWvT4q
+DKTsK8R1vk2kZPi7TmfODvu/2/23Vojk0hE1d7kqyCMYKYmrphSXL7sfkJn7Ti1kdtQMJQAQ0HUA
+m+QPxCfSAnDWmWWN5kVjKhU294Wm/IePcowJ3brQhprdK9QaxbtmAB4gBjfL5KCAP4gPJ22rNfU5
+y7mnajlOMZpxrleB4hkT7MIZcF5izbPysbxE3NquDykL6wxWJrMbQA9Iwhx0AaDNN4S1M8e3b0FC
+VOnCKWLWJk15UY/40L5dPMBR2LVvTUycECS+Y4j96blAO0aCZ5QKBQKBQKBQKBQYM/EO4xJPem5P
+pARImvrcZS2GS21fvCBbyZKpd7UeUilEe25cUO6fmAOIlKPmoINnTK3UxjZJvuwFuum2OpTkyE4Z
+c5iL3F4OBe9yu+QoS9RaIGZuYpyiIP8A5wEKCQ7uS8X5uElTXKGDbltAjWGUrzGnlCyTbNUvenOU
+NBjFO1HdmdmjAM7H3+xHuCYCmOblEA0HQKDExs26DnUV3vxlFml3RxnB2Pp45XZmhylufeXwMhT8
+XYAuuuQmqJtZTzx8HW+U/enATAIiHlEAzhYu8LvDMZKyyM3UIycabg26vr1C9t+MAaGrQdRKP2mm
+KYAHTyCA0F5y34bN/kCZY7RLf02SjITO26RVFnzaviyVxN0DlE3MaXQUzyLAAiGnDUdRDyaiAYM8
+oYFyj0otyeL5Vvw6dm3XPuHXuSs7jB5diPvnHsAljtFHwrmBsdZExmDQVhyOQR1BolRTdnENNaDK
+Blfxg+7G/OnxZhHadt4iGNwM19yseXnibSzIAl9EXQXV3gL2xx0TDqIaAQvKABxHUdA63HxW/Unl
+qGQSpJi3Z5F4/ieLhkWVxVwieVQNkZnGaw6BGibPec34t23dD31B0AS+lp5Q5QoOhJh1A+rX1386
+W9rGHHuNbfIRJYy7yLJGOsKvr3j7EzTEBFgJKcsbh8i3CGkE+j4mAQ7qETcwiHDt5gza4A6B3Tn2
+0MXvbuDWOG7KQRdqNJJRlLca7PjRiaHtEVZjGdgHHZjCxmjhdeAu4mNoABrwoPW2y/ed0ud0ORXv
+CWzxZhsJXAGszj7jt2BwxQ1S2Ksxu6TyvEoOeoz2PFHiJR0EAEB7BARD31kba/t9yvGFsUyvh3Dm
+QIo8/Vy1km2N2R2Hhpr8dBCt6znSwwl0+ZPineNgfHLXNNs8kyc1QbKe1rI7w+OsAiUodWIHNnJE
+5e1iL8aNT0veoB/qF8HTsAAAI++e5/D8jZJnT1ivCLbtZxVkV2iLrjzCceenx4izXFoqyvbaY55i
+7CMhyCY0gHi7jxHWgl5eEmWorsa3jWb7mnB7vLsNqSs6e4AEO3Eb5oN1yJa11OFpUrJaEwcC84AP
+bQTIKBQKBQKBQKBQKCPZ4jPcPCsebPl2AHO69qJtmpU33GFmYjmtOQoYxIGle4qVRSiIHTequksc
+nZ68dfIFBBh2vwfI0/3Asm3LHolheeMzzvEeN8WSuTOs0x/KsRZta8nsznE3geYBf8fyMH7s8oDx
+DQaDPb0pYvuT6j3VaSX+pI+SjLci6ceL3ZtW4yy0I92s+WMTTU8DaIhLCRnWNv0jYJ4dzdXh2MU/
+fpifWg6agITplStUrVe1q13tqseK5d8PIOlBgx8QPA92k32Crmnaf7+LUiKeM7ln6LYl78+0KW4o
+Bk/VHuu9C/yCOd//AKXaKDzx4dSD7x4ZtVyGl3HtmS4phN5nTQ2bWoTlYH4ssi7Ya4c+RXpqZnYw
+zqOY7K/HAjQDi5kIBSunDXURDNNvK2kId4exbcxiFZF41JLE2xbMEETROds4OLXm6KAcuO8gM98x
+PUsV2APxRN3mBuflDXTloI6fhK4Dt9zHC90kTybtWw/KMxYancPkqLN8ziLLPpd3TkFmMIY7A85Z
+3oWD3AFhAPqsSB6Qh5tQkwdUeMQzGfTr3gzKL7b8Y5YdYdg+YSRBjBbDYKaLu7mRsOhNKXW3dh9w
+twIFZdjyU33hh5DCAlHQShHa8LDi9hadjOfshNK7+8OXNxgRt9XdndETx8ycGj/43QSBdxuCEm4P
+A+Y9uKxc5oUm4HF0wxMK9t7Gd2lgatP66ZuHf7L81BHe6ZHh+M17EN48WzfuXzHA3oMSRl7DFcVx
+uZ5M7OztKmUYAMseBcw/2eIwvLqAtPn8gaUEqBL3okV+1pVzWALWvu1chcmgHZp7p83yUGHjr5R9
+ieOlFveUqW9sSJkbZjaaMKAoCLU1O8Vm7KDQDOUA9IwmenTh5aCHV1KWmxHdg/QbhC1LzP6TZ5uO
+kysugfWTRkLcFbcojb119LU5TG4/xvMFBx7p17jcydOp4xbvMxzOMQzmBZOl0txHljDzbKl16bRd
+AjXWHYbmTIkoaSPbNdlFhLaVMbmhJdsGOTQ5DFEQoNlHivKLbleIMM2jxrfccla2x0QqSmE4GbHp
+suX+cdQDQwAfT5qDtSgUCgUCgUCgUETPxDcXfse7jNj+5ppXNa3uWe43bEKGSfWzS0SyJ5RhcoaO
+9v8AlygjZ573hbp5tv1w7lzdchbmXeDti3EQ6P5Sm7bEGSAyt5+z3JzG5RVryC0NJWMDSKBmJ3WG
+gCPcGgajprQSfMJRMuyfxRW7HEKoXEsP6guK5dluDLiCUbLs65B0ycJ7RiiJDWTZbLKWwpg4CXQa
+CT5QUaVVp5/xIfN+/wAaAr/G/wAr/HVfk4UFvkGdf8PuG8pziQssZVQnHkXyTlqUrnF4eOEUijG9
+Sd2NoZjHUQBlHTycezsoMLPhNNvnuVsGnO5h2bzJJDu/zJLZShAAKBWzH+OxNBIeQphEdBLctuY6
+/J5xoJQMij7FL2B7ikhRNrvHpK3Okek7IvKHdjq1OjQLW7tPEDehctjoYO3lEeIDxoIa3RwiA7AN
+5HUU6W+QFzgilLPlQu4/AhrjV6tpyHiY7G9ldOQvKbnOeDPZXICiJf0F26gBRCSeKoEqpC7Jfypl
+dGdyQh5wag00HXgOtBV5NnJslCyilhp2l1ZnQoA8md7YgRpddSnEvJbIb0x4jrrx7NOyg4y1pXT8
+7XfDs17aDAx4g7Ib/LdueEenzicBes8dQDO0Qx4yxZsIU7qGPYm+A4yt3MU4lAxDSQxSj26APYPZ
+QYZPFRY5YsK7gOnxgloAyOI4J6fzXG0S5uDTkaGWde6PfHZwKJmQP2aBlLpCRjaJ4f1futywxlR7
+t8zZOwRkhWdxKbvfE+KHV91iWJWsOTlKHu+Yrq66mExtRDQALxCWZ0q/alfT72rq1n5WtxhD/wD5
+Hp5aDIZQKBQKBQKBQKCL14ophVq9r+K5Ck/U07efYfi/uS9a0EZPrfZFxTlffxK8m4VXtL28TTBW
+3SS5hfGsNGj/ABAGxkzDKXaI+XmJa0B48mtBN73lbC5b1I9suwrfFgmWtUY3z7ZIdCMhY/kYWrdt
+jmjw3JmxzmmJ5RbIIFtxpLPWZRbACh9+U/EObloPXm1LdXjvdjDn52iqxpZMrwt1LG8+YQcTC15D
+xLlYSlGXNRmgSF79jwHEQaHYBHgADrx0APTir8U8vk83k+bWg/fzVc6+w/VKP8vfHL6paWj/AMX+
+UaCNv1I92D71DsksXRz6c8rLkCZZalLa2b3dw8F0v4v287fGF4tnmMQGSWjA1Pr8b1gFdTaemIGa
+LfMZzMABLBwfhuD7ccJYtwTjdEDPAMSwaKY4iiINeDNFGfuu2A83pCY5SgJhH+FrpQdsJvJ8P41B
+gz6wnTbypukJivdxsukjfj/f/tMdTyHELm6EZgi2Vo0S6VydcR5FtvJu47idQBvQM4hyl5R1HlNq
+UPCeFOuBt5azDjPf/GZ506dzzO5dwZAx9mqGzUMUXJMICYrziXIIGfikjwELqIOhjAHaBjF0MIZF
+Eu/rZGri77LEu9LaWtjzK1+8b4ubcwMjt3Q0/tUHhHcZ1uNpcIi/dO3CVf4tdx8zax+x3B+JWd6l
+nvdLHbQIi0O/uv31Qc66WHS63GuO4OTdVPqj3W163sTNqux/C+IG7u0IBtYx4RoBsZSILbWpOity
+K3HjgQtv9TEMfm5nQR5Qjz+LmB0V7+MXNuhraJm2kwFGhMJSgCh/c5llq6a3buCHMPs9sSmOUo6f
+hCCID6IgHpjrR9SC5vF6cnSowLAUDiimu8xtxvnrIMXazEud2M+PALBWuLFOXQOSRZfHlAB/ia8d
+QoJSu0zF/wBiO2nCGJ/y33LgTPG/bv7JZBoPR9AoFAoFAoFAoMOvXMw39rGwXIyRIhBarhbozzVA
+P9k/pfj8TBQa62eJVUTS+1yFja1qTJzV/cicOXfbT3O7RN7/AL3C0eaR6/pag2anh3Mypsx9LXEF
+62495OGN5ZkrH0qvCcTnM7BML2QiWzBza2/ZYvPENkA/iWwHy0HPN43R7xtuDzIi3XbfcqSvZjvX
+ZGwW8mfMTs4OrZLWs+pjNWWcdg+MdvIFsSgUoauZD6E1ETcKDyFHtiXXwg6ebMEX6i+05+b5MYDM
+02mOCZrbl0UtgICcrLFzEfrdoxihwEXMwAPHQQDSg4M2+H73R7glKr/qNdXTc1uBijwcRf8AF2F2
+pmwjFXkumoC7uTWF23eAohwL3SXXyjQZttm2w/arsDxiGLNrmH43jOK8omkrwQDuUolbm29jrMZW
+5mF7kdz0dNTjoAhwAvHUPWXtSpWq/onZ5h+AUFd+SUFD7Uk9q9l0/wDUfJ+z2UHBMo4bxLm2PjE8
+xYrgmWY7x+pMiw5klzUHER5iklBDgIjrx4caDwE49EjpMOrkDou2CbdRXAGpu7Yd3UA8R491tTtb
+IbT4gD5KD1pgfZ/tX2rpXNLt027YcweR8H2F5W4pxvH4k6ufLobldXdqt235+AptBATGMOvHXhQe
+kknsn5pr8+v33x6+Wg14HiKMUZW3j9YiFbb9vURXZAzI9xHHUNjsUI+WmollRaht2bLpA9PGhAj0
+dZmY6ozsJjcvIQBAQ5h1DovpMbQVmY+pt7v+/Jct4n6frX9nEWnBQegiTs7Y+EYv3vEQcQAAjcgf
+w710oJ/qVKlSJUKRJr+JfRQf1QKBQKBQKBQKDic8i7XNobKom7IfbWmTtbxG1yH+1vmANaCGht+w
+Oyv8c6pHRrzBFYo4T52juYNyWyZ2dmcXV0bc/wAUgx3N3LjsSctz3kf2TldR5TlHl10HXSg9U+Df
+3NN7rBd3W0tZfIkfrMoie6WItvrhMdQzZBisfx3kO1bsj/NhFFsRiwnEOBu+Sa6CHEJwPs4fF9H/
+AJNBQ+zAl0EBAddfPpQflB1JnCKTycYkyhEcUTdBjPJcjgkvjeOcid0keCwGfO7DcTxKXXmo2oHL
+H3w/rBLrzCIB2jwoMT3To2z9YzblPTx3eDvOwTuxwCtI5OIuLnH5wXNrQ6uQga2ETl4gQl6NW9Ox
+zMJigI8ogI60GUjcUz5vkGEpy1bcJ1BcfZsXNJhx3NskRI8uikTdzCTleHWKtgiZ8KQAN6Iej6VB
+h56c2xfqt7eNwE2yrvi6kJd0uMZLFXhrQ4SaQmYM5JU5PRQtSlqLKGhlDH5I6Ajyg0l4ajxDhQZ4
+Ff5KOn5X5PP2cPh5qDivtSpIPzfP+6HkoKH2lV/pv+dQcqa1X417Jp9zt+Sg12uaN+cIxR1yOpzv
+QTPI2JRt4wtm3Fe3VtsN9u9ZmO5M7dCttcJLaMUD2jJ2YJY4vbsbTmuWkYDqACUaDM54c/bSrw5s
+tXZMkKD+9mdZR7ye3f1T+qOFBIWoFAoFAoFAoFAoFBg86r3Txyfm5+xzuw2nvjnC90uF3RncmNdG
+/ql1d+6v0R3R3pr/AHjoIJER3X7sOkf1DU+VouwXMZZvhzurWziAPaNtSwuYQ7IjgeVSeASdgZrV
+n2mPTNoUtdwTW1FtQiUprSlOa2otWrpA2nPTb6lO3/qc7a2XPOD3MELml9mZMq4rdVqe/MsRTsUv
+r1cZkVqyFoVbcrAh77S627RErqjD1hAt3SKE9gMgntQ+Yfo+5QWSg/j2oPMH0/coHeof6CP0UFEq
+fvZPzHTt+L46Cu70/Ffa/L5+Oumnm81BQqn5KrS+bT4aUHFFXYHyfuhQf1/ROPtn7vw+agwfdb3r
+UYw6V2KbUWgp2LIW9DIzABsZYzu3QWIYPZCwRMiyjkpKmuFvJo+hV3Td3N5jW770rtchNLBL922E
+SDoi9MJJ1EJBLs95hlrveh8QyevvPOtklh2yu7Op1zyZx7xt3rpbR1p043Dl5h0OYeI0GwTjEXYY
+QwsUTiSHuWPMrV3axoW39UNLT+3QX6gUCgUCgUCgUCgUCgggeLB2cEQS3H27KNtyowuyW7FJOqTN
+g2U4g3ktODStv3S8SlOkV3LIa66GTaeegjZ7BOoTuk6duXEud9rs7CJShU1Gjstj7y323+CZBjJr
+9tRdjs4i6k9pO7toqbRbtm7bOnXIrwesSqLFz06DYRdJvxQGIN/uScdbX874cfcH7msgX77PFXKF
+HUTPC08fG9pXvCuykUKDFmOPVitG3XTWEi+26oyFtiB3TnEhBCUd7UHmD6fuUFf7N8Xw/lUD2f8A
+oPw/k0D2b4vh/KoOPt8qhrs5rmhqlMZeXVIURXMra8szk6l0Lz6GaymA9vgHboFB9FTCl0D5P3v2
+qDrOYzGJ48iclnk8kjHDoTDWJ1k8tlkmc0bLHo1HGNFecXh9e3dwvWELY1NiBPcvX7945Ldq2QTG
+EACgiM7/ALxbO3fF9p3g2wyBr9w88spVaFNmGdJHaD4WYHG4nEidxZ48vSoshZHM3rAEt1PdsR1F
+c0LcsLVFsdBCBBmvNWV9y2WpvmjNczfMk5ZyW9LX2RyZ7VjddXd9XiFhtto7VoLdhGgbFF5PbSIk
+xLaZKjsBZtWyWyAUA2cnQy2vG2sdP/E7WuQmRSWesFibP6A46mC48lAxwMPZqAjpQZlaBQKBQKBQ
+KBQKBQKBQYsespt8btxHT6zzHFDf3gvYYkeYM63s1c4sUXIfP56DVAL2w8eenRgumC4REoOZFdEB
+AL6K5qe0YupQEwkKPKbT+EAhQZeOgffBN1hNhtwbg2+bMd+wBg14+1QqWJQt8A1/Cje5R8mg8aDb
+v8PyT4/j+GtBi46n217qN7oo1jCP7Cd4LbtLTNTs7DmVwFtfWyUytvLbIDQdolUbtnfLWlspw5CC
+TUTAbmERMUQwoj4YveRkFT78Zu6w2eXrLIOQuSB6a2iauzU1iGoho7yqbA/aj2cRAKDlBfDK7qZw
+l93s89YjcZkHH3YvYu6Xp2M6tenMBTe802ewA4APkoL6/eEc2wtLWiV4T3abn8Y5MZTd4sU4cRhL
+w1d6ejoJmhsZWLQPOACPD46DN507tr+47Zlt1JiHcJuklO7ycDOHmQo8nzkXj1jRFHUS9yxExpFe
+f3seQebXiOgmHQQ8ocU6tS49vpj7/hUGKU5toWf7IGNygGqjGcis6cTaamC7oHl1Gg04lB696emH
+Q3Bb4du+LbgWRbXeftl13u3ya2EaBuLec1Ks5/4iRMlPdMGnH1Q8aDb6MLWljzCxx9o/EkbM1s7a
+h1/qny+Sgv8AQW/89+HmoLhQKBQKBQKBQKC30FwoOjd0DD7w7c84NOv5bi/JH0sj15vjoNU5k3aJ
+Pp1tryZvAgdkr/HdvOV4nizNLClIAusEj8/tOqXGE+dA1KYI5K5AwrWk94Q5bS6xbAeBxEA7j6EC
+4P8Aq6bBFVsto2ueWe2e2oAwlKFxme7N4pigICFwhDmEvEQ5g7PJQbe50Sqkirj9zjx/yaCva3T8
+04/D4fJQeC99rV1K3VPClHT2k+CWVQhK7BkSLZt74aXB3KHMVoc2SVkhs0EvqgLx1KGuocR0HQMS
+/wBiHidcnKwapDuZ2lYXj638tXRx3+tw1D9Ti17fOHCgzzbOcXZ3wlt9hWPtx+cTbjctMguwSnKg
+s/uuDwVze/WDpbA4gAMRTCUR0Awh8gUHc6qUflyTT5fpHtGgxndXQ43elz1AFZC857e1DMxFZQNy
+cpr8Mc05T66Dwtjd10/haacNaDTzakJbu3ro8tmwUDHADlJcumMPLZT2NSXBMoU3TAUgAQ/LxOYO
+QpjAGbjoqYpkkT6jG0lmnDK5w97m7uyTi2nemS9bc7sOl8WI5wJ8aS3RG4ZskLW5kV2DDxPbtgOn
+Gg2i1AoLH+c/Dz0F8oFAoFAoFAoFAoFB1vlpL7Xi/IyVV+SLYHMGzs/1syfPQRaPDWQ6HzfMvVo2
+25AijdNcZTeNw5slcKkIFFolTQWZ5RjfdVzm1AbZ2F3AnDjqYNNO0AxIbn+n9IugH1WtsW5NZFJr
+kXZW3bho3PMXy5uS2zya3HbLtzu+G38pQ5XDL8KZLt0ycDjyyZNbtqbYAJ74gGyjwxmfGO43FOP8
+u4ombZPMbZIjDTIobNmIxitjw2udpPoa2Y1rmZnzQ4lM2jxKcvKIagIFDsNKl7pVf+m9v7vH56Dk
+FAoOByhzVpPxRIuHT975NKCxtbCrVqtfzT976KDGn11Z3FcX9I7fCofndG0kkuGHTH7SdUptIlb3
+Mp8rRxlrj6BKe8Fxe8uV9yC6CK2BjWEFu9d0ApDCAQEuhP0dXrqL5oTZJyzHVSbZ1geStTlld4vn
+IlsZWlgJiObVhGN63LalcpfbdwUkhUCNv3bRhzfg1CgxRDMVkVqSKvFErStCBqQtEWc8DRhiQtjM
+DQ0M7Q0bXcLgDOz/APLYUEy+gUFv9l/Gu3h9H7etBcKBQKBQKBQKBQKBQcGyh/sHOPa/+F3j5P0J
++xQRlvC/6O+9LqaStJqtSf3PbES7savrbKOTnPUB4Dw7loJYm6va9hLehhqbbdNwULb5njCftpkT
+83gTV3bHQSn7plUTdTEPdYJDHTH5gdS6GAwAHZqUQhPMkh3o+GO3RLIVMGnIm5vppZslZHNvfm+7
+daBZ3RfbuJrcpx/a0MwwTcKyWiAWUNBvQnRQAQ0ECmKEx3b3uuwzu6xgxZp2+ZTa8sQB5KXleo2G
+jlE3YSmHubIEU5SvsDkhfVjqDpoYoBqIAAgIh3MlfnT/AE7234fL8dB+9+qvZfy7h5/39aCg70+V
+YHw+fQKDxPv86tG07pr48XSDPE2aHDJXdxl8MwDDXdmc825CcfVczTyRAxDhB4+c5ih3s6CUoAI8
+dS8pgiewXDfUP8TZmtiz1uDcpZtm6c+LnYjlB2WPkdjtN0AtnLcaMUA6Ax28v5FPw74yA5k9WyAY
+e6gAAABCZriLDWJ9vOI4NgfCmO2qA4rxi1BGoVGGsnIDUbiI8roJji/SGQDq6urqJjCAeUR40ETb
+cSdFjbxMKF4fkhWhnmZsFSFkFwMBwdmtywvDYpcddQEQ5iXISICHkEBCgl7JPyX9j/NoP6oFAoFA
+oFAoFAoFAoLC/PzDE2BdIZC+NjK0srWLkuXOf6KaGnXWgih9XLrwRdpYXzA2zmVNcndlrW8Nk3yo
+2fW0TaGnT/dH/iCR8aDIn4VrbE54n2MS7cJNWRwZ5buzyh76My50OUHN1xRFCg3Y8drg8RAX57fH
+QwgIBqA/PQSQ350VpHT2v804fPrxoOKT2LYlz1A3rGWWIvGZ/CZM1d2vsVkbODs0PID/AABAQEPn
+4DQRoc0+HPyFhLIS3O/Sn3TzfbJOu8gcUUJty98aGY/okAzULmYX1inZhuCbQkpbbgAUOJhoPLjp
+uq8UVtPfl0eybtJgm6pp/wCKW3D3vZ3v5vrfDc0839V0HE3XrHeIHWJQSR/o8NqFWHYucdrO4qVB
+2eXlFk7dPLQcWM+eLE3kMKtqaWBq2rwiSD3e9OBmfF230QbHcpiCYoyiZZNy8QRIYQ+qmvXQR40H
+vPYd4XXDcKfkOd+oZlVw3l5sXCDk5RxxdHp8xaDoJbnrAlMqlRiTrLpyjyCQ7qDOGuoDbEONBKwY
+o+xRppQsEcZ29lZmRtam5nZG5rI2NLO0tfFqbGtqRDpbJaEB0AvAPNpwoPkqa0ventfsP0cOzhxo
+I9XXg6X8o3SwKK7mtuCF0/xS7cNO42KNh9b5cxP3370O+Omnj/tHH38O9Gmg6r6afVyxhm3HSHGW
+4+VNeMs8wv8Au2+e+31S0y52aP8A6fkf+t2igzgNbqldkqF2aVwrUi38hXNvyfTQXCgUCgUCgUCg
+UHW+UMtY5w5F104ybOIvC48i1/HpI8A0j5P3KCMtvc8SxA8eql0T2nwgZo7fmE4m31TE+9v7ID6/
+1oIqW6rqg7vt3ar/AO7OYZQtj3/A8b/unE//AHQ10HafRdw5gHdH1MdtOEt0DN74YsyCSZlVQkXV
+9bWaWSyKsBpNjxpeiEuWz3I0Pc3EoCAmARDUKDbVsLC0xlpRR6PIm5naGduaW5mZm5pBpamdqaQH
+upra2rUOQpNNOH3vAAANAAAuipKlV8OPk+X5x40FjVMLX5PJ9z7oUFclSpUg/ivy60Fd7T8fw/k0
+D8W+GlB+eyJvMP0/coPrQfL2RN5h+n7lB9aC2pfaUn9NS/F8n7VBhV6kPRe26b2SPOWIosvbc9yO
+neAZhhTIV2bZgctsxjfaRj0nLYnoiJBDXUr1zcAHiFBFVxb1JNxfSM3ZZg2eZhfGzM8dxPJix6Uo
+G92uW2sAEAOzy3HhJYBTkMAD+hxABDy0Er7aD1DttO8aLd7YyyM1+8I/l0GcnfumWcP6oCg94UCg
+UCgUCgsEl9r7qXd3d5e2/wDLHc3evze9X1DQQfeun72e8yHvD/qA+26//tb7Ffs67P8AdD3Z+oaC
+I7KO9u8lv+3f336z9y+zh837v0UHFU/evtHD3k1+L3N1+fm9HWg9pdPb3g/xx7SO7vte9u/xN459
+g+zn7M/tD9Z37w91vej+73vlp2d5fgvPxoNz83e1d12vaO9Pbe7Q5u9+5u9P5sf073X9Qa/5Hk1o
+L7QU9AoKigp6BQKC2pfa9f1n83cvm8nxUD8b9r/Wfb/UnN2UFyoFBqTOvl3p/wBW/ePr78a+/bRp
+3f7na69yk/S3L6PNprprw018ulB0lsj94vtjg/8A/Umnegf/AIk+y37Qu3/dHy0Gyl2Xe932ZJ/e
+r/Fxp3Y0d2/4tvsR95f/AAH7Gvwmn9rUHsOgUCg//9k=
+
+--Apple-Mail=_83444AF4-343C-4F75-AF8F-14E1E7434FC1--
+
+--Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74--
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index bef8e22a9..f5d8f80c2 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe ReplyMailbox, type: :mailbox do
     let(:account) { create(:account) }
     let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
     let(:reply_mail) { create_inbound_email_from_fixture('reply.eml') }
+    let(:reply_to_mail) { create_inbound_email_from_fixture('reply_to.eml') }
     let(:mail_with_quote) { create_inbound_email_from_fixture('mail_with_quote.eml') }
     let(:conversation) { create(:conversation, assignee: agent, inbox: create(:inbox, account: account, greeting_enabled: false), account: account) }
     let(:described_subject) { described_class.receive reply_mail }
@@ -59,12 +60,37 @@ RSpec.describe ReplyMailbox, type: :mailbox do
         reply_mail_without_uuid.mail['In-Reply-To'] = '<conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123@test.com>'
       end
 
-      it 'find channel with reply to mail' do
+      it 'find channel with in-reply-to mail' do
         described_subject
         expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
       end
     end
 
+    context 'with reply_to email address present' do
+      let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+      let(:conversation_1) do
+        create(
+          :conversation,
+          assignee: agent,
+          inbox: email_channel.inbox,
+          account: account,
+          additional_attributes: { mail_subject: "Discussion: Let's debate these attachments" }
+        )
+      end
+
+      before do
+        conversation_1.update!(uuid: '6bdc3f4d-0bec-4515-a284-5d916fdde489')
+      end
+
+      it 'prefer reply-to over from address' do
+        described_class.receive reply_to_mail
+        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
+
+        email = conversation_1.messages.last.content_attributes['email']
+        expect(reply_to_mail.mail['Reply-To'].value).to include(email['from'][0])
+      end
+    end
+
     context 'without email to address' do
       let(:forwarder_email) { create_inbound_email_from_fixture('forwarder_email.eml') }
       let(:in_reply_to_email) { create_inbound_email_from_fixture('in_reply_to.eml') }
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
index e25cee6de..da2e1df9f 100644
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ b/spec/mailboxes/support_mailbox_spec.rb
@@ -179,5 +179,24 @@ RSpec.describe SupportMailbox, type: :mailbox do
         expect(conversation.messages.last.content_attributes['email']['subject']).to eq('Get Paid to post an article')
       end
     end
+
+    describe 'Sender with reply_to email address' do
+      let(:reply_to_mail) { create_inbound_email_from_fixture('reply_to.eml') }
+      let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
+
+      it 'prefer reply-to over from address' do
+        email_channel
+        described_class.receive reply_to_mail
+
+        conversation_1 = Conversation.last
+        email = conversation_1.messages.last.content_attributes['email']
+
+        expect(reply_to_mail.mail['From'].value).to be_present
+        expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
+        expect(reply_to_mail.mail['Reply-To'].value).to include(email['from'][0])
+        expect(reply_to_mail.mail['Reply-To'].value).to include(conversation_1.contact.email)
+        expect(reply_to_mail.mail['From'].value).not_to include(conversation_1.contact.email)
+      end
+    end
   end
 end

From 351a3dc3726a6d79e9097a40512248ea16c177f4 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 15 Feb 2022 10:38:24 +0530
Subject: [PATCH 091/101] feat: Adds email signature form to profile settings
 (#3906)

---
 app/javascript/dashboard/api/auth.js          |   6 +-
 .../widgets/WootWriter/ReplyBottomPanel.vue   |  39 +++++-
 .../widgets/conversation/ReplyBox.vue         |  49 ++++++-
 .../i18n/locale/en/conversation.json          |   3 +
 .../dashboard/i18n/locale/en/settings.json    |  12 ++
 .../dashboard/settings/profile/Index.vue      |   5 +-
 .../settings/profile/MessageSignature.vue     | 124 ++++++++++++++++++
 .../dashboard/store/modules/auth.js           |   6 +
 .../store/modules/specs/auth/getters.spec.js  |  16 +++
 .../FluentIcon/dashboard-icons.json           |   1 +
 10 files changed, 254 insertions(+), 7 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue

diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index e5ed77a34..189d1c198 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -142,9 +142,9 @@ export default {
   }) {
     const formData = new FormData();
     Object.keys(profileAttributes).forEach(key => {
-      const value = profileAttributes[key];
-      if (value) {
-        formData.append(`profile[${key}]`, value);
+      const hasValue = profileAttributes[key] === undefined;
+      if (!hasValue) {
+        formData.append(`profile[${key}]`, profileAttributes[key]);
       }
     });
     formData.append('profile[display_name]', displayName || '');
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 1d71f82a0..6481ad57a 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -2,6 +2,7 @@
   <div class="bottom-box" :class="wrapClass">
     <div class="left-wrap">
       <woot-button
+        v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_EMOJI_ICON')"
         :title="$t('CONVERSATION.REPLYBOX.TIP_EMOJI_ICON')"
         icon="emoji"
         emoji="😊"
@@ -14,6 +15,7 @@
       <!-- ensure the same validations for attachment types are implemented in  backend models as well -->
       <file-upload
         ref="upload"
+        v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_ATTACH_ICON')"
         :size="4096 * 4096"
         :accept="allowedFileTypes"
         :multiple="enableMultipleFileUpload"
@@ -38,6 +40,7 @@
       </file-upload>
       <woot-button
         v-if="enableRichEditor && !isOnPrivateNote"
+        v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_FORMAT_ICON')"
         icon="quote"
         emoji="🖊️"
         color-scheme="secondary"
@@ -46,6 +49,16 @@
         :title="$t('CONVERSATION.REPLYBOX.TIP_FORMAT_ICON')"
         @click="toggleFormatMode"
       />
+      <woot-button
+        v-if="showMessageSignatureButton"
+        v-tooltip.top-end="signatureToggleTooltip"
+        icon="signature"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
+        :title="signatureToggleTooltip"
+        @click="toggleMessageSignature"
+      />
       <transition name="modal-fade">
         <div
           v-show="$refs.upload && $refs.upload.dropActive"
@@ -90,13 +103,16 @@ import {
   hasPressedAltAndAKey,
 } from 'shared/helpers/KeyboardHelpers';
 import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import inboxMixin from 'shared/mixins/inboxMixin';
+
 import { ALLOWED_FILE_TYPES } from 'shared/constants/messages';
 
 import { REPLY_EDITOR_MODES } from './constants';
 export default {
   name: 'ReplyTopPanel',
   components: { FileUpload },
-  mixins: [eventListenerMixins],
+  mixins: [eventListenerMixins, uiSettingsMixin, inboxMixin],
   props: {
     mode: {
       type: String,
@@ -110,6 +126,10 @@ export default {
       type: String,
       default: '',
     },
+    inbox: {
+      type: Object,
+      default: () => ({}),
+    },
     showFileUpload: {
       type: Boolean,
       default: false,
@@ -175,6 +195,18 @@ export default {
     allowedFileTypes() {
       return ALLOWED_FILE_TYPES;
     },
+    showMessageSignatureButton() {
+      return !this.isPrivate && this.isAnEmailChannel;
+    },
+    sendWithSignature() {
+      const { send_with_signature: isEnabled } = this.uiSettings;
+      return isEnabled;
+    },
+    signatureToggleTooltip() {
+      return this.sendWithSignature
+        ? this.$t('CONVERSATION.FOOTER.DISABLE_SIGN_TOOLTIP')
+        : this.$t('CONVERSATION.FOOTER.ENABLE_SIGN_TOOLTIP');
+    },
   },
   mounted() {
     ActiveStorage.start();
@@ -194,6 +226,11 @@ export default {
     toggleEnterToSend() {
       this.$emit('toggleEnterToSend', !this.enterToSendEnabled);
     },
+    toggleMessageSignature() {
+      this.updateUISettings({
+        send_with_signature: !this.sendWithSignature,
+      });
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 257b7bd3a..2f9681c22 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -66,8 +66,16 @@
         :remove-attachment="removeAttachment"
       />
     </div>
+    <div
+      v-if="showMessageSignature"
+      v-tooltip="$t('CONVERSATION.FOOTER.MESSAGE_SIGN_TOOLTIP')"
+      class="message-signature-wrap"
+    >
+      <p class="message-signature" v-html="formatMessage(messageSignature)" />
+    </div>
     <reply-bottom-panel
       :mode="replyType"
+      :inbox="inbox"
       :send-button-text="replyButtonLabel"
       :on-direct-file-upload="onDirectFileUpload"
       :show-file-upload="showFileUpload"
@@ -101,6 +109,7 @@ import ReplyBottomPanel from 'dashboard/components/widgets/WootWriter/ReplyBotto
 import Banner from 'dashboard/components/ui/Banner.vue';
 import { REPLY_EDITOR_MODES } from 'dashboard/components/widgets/WootWriter/constants';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
@@ -128,7 +137,13 @@ export default {
     WootMessageEditor,
     Banner,
   },
-  mixins: [clickaway, inboxMixin, uiSettingsMixin, alertMixin],
+  mixins: [
+    clickaway,
+    inboxMixin,
+    uiSettingsMixin,
+    alertMixin,
+    messageFormatterMixin,
+  ],
   props: {
     selectedTweet: {
       type: [Object, String],
@@ -162,6 +177,7 @@ export default {
   computed: {
     ...mapGetters({
       currentChat: 'getSelectedChat',
+      messageSignature: 'getMessageSignature',
       currentUser: 'getCurrentUser',
     }),
 
@@ -333,6 +349,13 @@ export default {
     enableMultipleFileUpload() {
       return this.isAnEmailChannel || this.isAWebWidgetInbox || this.isAPIInbox;
     },
+    showMessageSignature() {
+      return !this.isPrivate && this.isAnEmailChannel && this.sendWithSignature;
+    },
+    sendWithSignature() {
+      const { send_with_signature: isEnabled } = this.uiSettings;
+      return isEnabled;
+    },
   },
   watch: {
     currentChat(conversation) {
@@ -444,7 +467,10 @@ export default {
         return;
       }
       if (!this.showMentions) {
-        const newMessage = this.message;
+        let newMessage = this.message;
+        if (this.sendWithSignature && this.messageSignature) {
+          newMessage += '\n\n' + this.messageSignature;
+        }
         const messagePayload = this.getMessagePayload(newMessage);
         this.clearMessage();
         try {
@@ -623,6 +649,25 @@ export default {
   margin-bottom: 0;
 }
 
+.message-signature-wrap {
+  margin: 0 var(--space-normal);
+  padding: var(--space-small);
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  border: 1px dashed var(--s-100);
+  border-radius: var(--border-radius-small);
+
+  &:hover {
+    background: var(--s-25);
+  }
+}
+
+.message-signature {
+  width: fit-content;
+  margin: 0;
+}
+
 .attachment-preview-box {
   padding: 0 var(--space-normal);
   background: transparent;
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 77a273ead..2293704d8 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
       "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
     },
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index f46b6e2e7..0fa169fc2 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR":"Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Password",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 053ac5e50..f9bfc6a91 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -66,6 +66,7 @@
         </div>
       </div>
     </form>
+    <message-signature />
     <change-password />
     <notification-settings />
     <div class="profile--settings--row row">
@@ -95,13 +96,15 @@ import { mapGetters } from 'vuex';
 import { clearCookiesOnLogout } from '../../../../store/utils/api';
 import NotificationSettings from './NotificationSettings';
 import alertMixin from 'shared/mixins/alertMixin';
-import ChangePassword from './ChangePassword.vue';
+import ChangePassword from './ChangePassword';
+import MessageSignature from './MessageSignature';
 import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 
 export default {
   components: {
     NotificationSettings,
     ChangePassword,
+    MessageSignature,
   },
   mixins: [alertMixin, globalConfigMixin],
   data() {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
new file mode 100644
index 000000000..4343b772d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
@@ -0,0 +1,124 @@
+<template>
+  <form @submit.prevent="updateSignature()">
+    <div class="profile--settings--row row">
+      <div class="columns small-3">
+        <h4 class="block-title">
+          {{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.TITLE') }}
+        </h4>
+        <p>{{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.NOTE') }}</p>
+      </div>
+      <div class="columns small-9 medium-5">
+        <div>
+          <label for="message-signature-input">{{
+            $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE.LABEL')
+          }}</label>
+          <woot-message-editor
+            id="message-signature-input"
+            v-model="messageSignature"
+            class="message-editor"
+            :is-format-mode="true"
+            :placeholder="
+              $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE.PLACEHOLDER')
+            "
+            @blur="$v.messageSignature.$touch"
+          />
+        </div>
+        <woot-button
+          :is-loading="isUpdating"
+          type="submit"
+          :is-disabled="$v.messageSignature.$invalid"
+        >
+          {{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.BTN_TEXT') }}
+        </woot-button>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script>
+import { required } from 'vuelidate/lib/validators';
+import { mapGetters } from 'vuex';
+
+import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: {
+    WootMessageEditor,
+  },
+  mixins: [alertMixin],
+  data() {
+    return {
+      messageSignature: '',
+      enableMessageSignature: false,
+      isUpdating: false,
+      errorMessage: '',
+    };
+  },
+  validations: {
+    messageSignature: {
+      required,
+    },
+  },
+  computed: {
+    ...mapGetters({
+      currentUser: 'getCurrentUser',
+      currentUserId: 'getCurrentUserID',
+    }),
+  },
+  watch: {
+    currentUser() {
+      this.initValues();
+    },
+  },
+  mounted() {
+    this.initValues();
+  },
+  methods: {
+    initValues() {
+      const { message_signature: messageSignature } = this.currentUser;
+      this.messageSignature = messageSignature;
+    },
+    async updateSignature() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.ERROR'));
+        return;
+      }
+
+      try {
+        await this.$store.dispatch('updateProfile', {
+          message_signature: this.messageSignature,
+          message_signature_enabled: true,
+        });
+        this.errorMessage = this.$t(
+          'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.API_SUCCESS'
+        );
+      } catch (error) {
+        this.errorMessage = this.$t(
+          'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.API_ERROR'
+        );
+        if (error?.response?.data?.message) {
+          this.errorMessage = error.response.data.message;
+        }
+      } finally {
+        this.isUpdating = false;
+        this.showAlert(this.errorMessage);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.profile--settings--row {
+  .ProseMirror-woot-style {
+    height: 8rem;
+  }
+
+  .editor-root {
+    background: var(--white);
+    margin-bottom: var(--space-normal);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index ffd3aee26..4d5c75323 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -65,6 +65,12 @@ export const getters = {
   getCurrentUser(_state) {
     return _state.currentUser;
   },
+
+  getMessageSignature(_state) {
+    const { message_signature: messageSignature } = _state.currentUser;
+
+    return messageSignature || '';
+  },
 };
 
 // actions
diff --git a/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js b/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
index 742b259dc..08e5d350f 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
@@ -37,4 +37,20 @@ describe('#getters', () => {
       })
     ).toEqual({ is_contact_sidebar_open: true });
   });
+  describe('#getMessageSignature', () => {
+    it('Return signature when signature is present', () => {
+      expect(
+        getters.getMessageSignature({
+          currentUser: { message_signature: 'Thanks' },
+        })
+      ).toEqual('Thanks');
+    });
+    it('Return empty string when signature is not present', () => {
+      expect(
+        getters.getMessageSignature({
+          currentUser: {},
+        })
+      ).toEqual('');
+    });
+  });
 });
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 46bb92a22..3b896a86b 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -100,6 +100,7 @@
   "send-clock-outline": "M5.694 12 2.299 3.272c-.236-.608.356-1.189.942-.982l.093.04 18 9a.752.752 0 0 1 .264 1.124 6.473 6.473 0 0 0-4.272-1.452L4.402 4.54l2.61 6.71h6.627a.75.75 0 0 1 .724.556c-.472.26-.909.578-1.3.944H7.011l-2.609 6.71 6.753-3.377a6.522 6.522 0 0 0-.147 1.75l-7.674 3.838c-.583.291-1.217-.245-1.065-.847l.03-.096L5.694 12ZM23 17.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0Zm-5.5 0h2a.5.5 0 1 1 0 1H17a.5.5 0 0 1-.5-.5v-3a.5.5 0 0 1 1 0v2.5Z",
   "settings-outline": "M12.012 2.25c.734.008 1.465.093 2.182.253a.75.75 0 0 1 .582.649l.17 1.527a1.384 1.384 0 0 0 1.927 1.116l1.401-.615a.75.75 0 0 1 .85.174 9.792 9.792 0 0 1 2.204 3.792.75.75 0 0 1-.271.825l-1.242.916a1.381 1.381 0 0 0 0 2.226l1.243.915a.75.75 0 0 1 .272.826 9.797 9.797 0 0 1-2.204 3.792.75.75 0 0 1-.848.175l-1.407-.617a1.38 1.38 0 0 0-1.926 1.114l-.169 1.526a.75.75 0 0 1-.572.647 9.518 9.518 0 0 1-4.406 0 .75.75 0 0 1-.572-.647l-.168-1.524a1.382 1.382 0 0 0-1.926-1.11l-1.406.616a.75.75 0 0 1-.849-.175 9.798 9.798 0 0 1-2.204-3.796.75.75 0 0 1 .272-.826l1.243-.916a1.38 1.38 0 0 0 0-2.226l-1.243-.914a.75.75 0 0 1-.271-.826 9.793 9.793 0 0 1 2.204-3.792.75.75 0 0 1 .85-.174l1.4.615a1.387 1.387 0 0 0 1.93-1.118l.17-1.526a.75.75 0 0 1 .583-.65c.717-.159 1.45-.243 2.201-.252Zm0 1.5a9.135 9.135 0 0 0-1.354.117l-.109.977A2.886 2.886 0 0 1 6.525 7.17l-.898-.394a8.293 8.293 0 0 0-1.348 2.317l.798.587a2.881 2.881 0 0 1 0 4.643l-.799.588c.32.842.776 1.626 1.348 2.322l.905-.397a2.882 2.882 0 0 1 4.017 2.318l.11.984c.889.15 1.798.15 2.687 0l.11-.984a2.881 2.881 0 0 1 4.018-2.322l.905.396a8.296 8.296 0 0 0 1.347-2.318l-.798-.588a2.881 2.881 0 0 1 0-4.643l.796-.587a8.293 8.293 0 0 0-1.348-2.317l-.896.393a2.884 2.884 0 0 1-4.023-2.324l-.11-.976a8.988 8.988 0 0 0-1.333-.117ZM12 8.25a3.75 3.75 0 1 1 0 7.5 3.75 3.75 0 0 1 0-7.5Zm0 1.5a2.25 2.25 0 1 0 0 4.5 2.25 2.25 0 0 0 0-4.5Z",
   "share-outline": "M6.747 4h3.464a.75.75 0 0 1 .102 1.493l-.102.007H6.747a2.25 2.25 0 0 0-2.245 2.096l-.005.154v9.5a2.25 2.25 0 0 0 2.096 2.245l.154.005h9.5a2.25 2.25 0 0 0 2.245-2.096l.005-.154v-.498a.75.75 0 0 1 1.494-.101l.006.101v.498a3.75 3.75 0 0 1-3.55 3.745l-.2.005h-9.5a3.75 3.75 0 0 1-3.745-3.55l-.005-.2v-9.5a3.75 3.75 0 0 1 3.55-3.745l.2-.005h3.464-3.464ZM14.5 6.52V3.75a.75.75 0 0 1 1.187-.61l.082.069 5.994 5.75c.28.268.306.7.077.997l-.077.085-5.994 5.752a.75.75 0 0 1-1.262-.434l-.007-.107v-2.725l-.344.03c-2.4.25-4.7 1.33-6.914 3.26-.52.453-1.323.025-1.237-.658.664-5.32 3.446-8.252 8.195-8.62l.3-.02V3.75v2.77ZM16 5.509V7.25a.75.75 0 0 1-.75.75c-3.874 0-6.274 1.676-7.312 5.157l-.079.279.352-.237C10.45 11.737 12.798 11 15.251 11a.75.75 0 0 1 .743.648l.007.102v1.743L20.16 9.5l-4.16-3.991Z",
+  "signature-outline": "M14.75 16.5c1.308 0 1.818.582 2.205 1.874l.068.237c.183.658.292.854.513.946.259.106.431.091.703-.048l.147-.083c.053-.031.11-.068.176-.111l.663-.452c.616-.405 1.17-.672 1.843-.84a.75.75 0 0 1 .364 1.454 4.03 4.03 0 0 0-1.146.49l-.298.19-.48.329a5.45 5.45 0 0 1-.583.357c-.643.33-1.27.385-1.96.1-.746-.306-1.046-.78-1.327-1.721l-.156-.542c-.181-.59-.305-.68-.732-.68-.31 0-.63.155-1.069.523l-.184.16-.921.876c-1.408 1.324-2.609 1.966-4.328 1.966-1.686 0-3.144-.254-4.368-.768l2.947-.805c.447.049.921.073 1.421.073 1.183 0 2.032-.415 3.087-1.362l.258-.239.532-.511c.236-.227.414-.39.592-.54.684-.573 1.305-.873 2.033-.873Zm4.28-13.53a3.579 3.579 0 0 1 0 5.06l-.288.289c1.151 1.401 1.11 2.886.039 3.96l-2.001 2.002a.75.75 0 0 1-1.06-1.062l1.999-1.999c.485-.486.54-1.09-.04-1.838l-8.617 8.617a2.25 2.25 0 0 1-1 .58l-5.115 1.394a.75.75 0 0 1-.92-.92l1.394-5.116a2.25 2.25 0 0 1 .58-1L13.97 2.97a3.578 3.578 0 0 1 5.061 0Zm-4 1.06L5.062 14a.75.75 0 0 0-.193.332l-1.05 3.85 3.85-1.05A.75.75 0 0 0 8 16.938l9.969-9.969a2.078 2.078 0 1 0-2.94-2.939Z",
   "sound-source-outline": "M3.5 12a8.5 8.5 0 1 1 14.762 5.748l.992 1.135A9.966 9.966 0 0 0 22 12c0-5.523-4.477-10-10-10S2 6.477 2 12a9.966 9.966 0 0 0 2.746 6.883l.993-1.134A8.47 8.47 0 0 1 3.5 12Z M19.25 12.125a7.098 7.098 0 0 1-1.783 4.715l-.998-1.14a5.625 5.625 0 1 0-8.806-.15l-1.004 1.146a7.125 7.125 0 1 1 12.59-4.571Z M16.25 12a4.23 4.23 0 0 1-.821 2.511l-1.026-1.172a2.75 2.75 0 1 0-4.806 0L8.571 14.51A4.25 4.25 0 1 1 16.25 12Z M12.564 12.756a.75.75 0 0 0-1.128 0l-7 8A.75.75 0 0 0 5 22h14a.75.75 0 0 0 .564-1.244l-7-8Zm4.783 7.744H6.653L12 14.389l5.347 6.111Z",
   "speaker-1-outline": "M14.704 3.442c.191.226.296.512.296.808v15.502a1.25 1.25 0 0 1-2.058.954L7.975 16.5H4.25A2.25 2.25 0 0 1 2 14.25v-4.5A2.25 2.25 0 0 1 4.25 7.5h3.725l4.968-4.204a1.25 1.25 0 0 1 1.761.147ZM13.5 4.79 8.525 9H4.25a.75.75 0 0 0-.75.75v4.5c0 .415.336.75.75.75h4.275l4.975 4.213V4.79Zm3.604 3.851a.75.75 0 0 1 1.03.25c.574.94.862 1.992.862 3.14 0 1.149-.288 2.201-.862 3.141a.75.75 0 1 1-1.28-.781c.428-.702.642-1.483.642-2.36 0-.876-.214-1.657-.642-2.359a.75.75 0 0 1 .25-1.03Z",
   "speaker-mute-outline": "M12.92 3.316c.806-.717 2.08-.145 2.08.934v15.496c0 1.078-1.274 1.65-2.08.934l-4.492-3.994a.75.75 0 0 0-.498-.19H4.25A2.25 2.25 0 0 1 2 14.247V9.75a2.25 2.25 0 0 1 2.25-2.25h3.68a.75.75 0 0 0 .498-.19l4.491-3.993Zm.58 1.49L9.425 8.43A2.25 2.25 0 0 1 7.93 9H4.25a.75.75 0 0 0-.75.75v4.497c0 .415.336.75.75.75h3.68a2.25 2.25 0 0 1 1.495.57l4.075 3.623V4.807ZM16.22 9.22a.75.75 0 0 1 1.06 0L19 10.94l1.72-1.72a.75.75 0 1 1 1.06 1.06L20.06 12l1.72 1.72a.75.75 0 1 1-1.06 1.06L19 13.06l-1.72 1.72a.75.75 0 1 1-1.06-1.06L17.94 12l-1.72-1.72a.75.75 0 0 1 0-1.06Z",

From 2591a04c0b29e9d1ed39bf7fa75805d04cc19d2b Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 15 Feb 2022 12:10:53 +0530
Subject: [PATCH 092/101] chore: Remove message_signature_enabled from users
 (#3982)

---
 app/controllers/api/v1/profiles_controller.rb |  1 -
 app/javascript/dashboard/api/auth.js          |  4 ++
 .../settings/profile/MessageSignature.vue     |  1 -
 app/models/super_admin.rb                     | 57 +++++++++----------
 app/models/user.rb                            | 57 +++++++++----------
 app/views/api/v1/models/_user.json.jbuilder   |  1 -
 .../api/v1/models/_user.json.jbuilder         |  1 -
 ...060751_remove_message_signature_enabled.rb |  5 ++
 db/schema.rb                                  | 17 +-----
 .../api/v1/profiles_controller_spec.rb        |  4 +-
 10 files changed, 67 insertions(+), 81 deletions(-)
 create mode 100644 db/migrate/20220215060751_remove_message_signature_enabled.rb

diff --git a/app/controllers/api/v1/profiles_controller.rb b/app/controllers/api/v1/profiles_controller.rb
index c810500f9..fb9c3b62c 100644
--- a/app/controllers/api/v1/profiles_controller.rb
+++ b/app/controllers/api/v1/profiles_controller.rb
@@ -39,7 +39,6 @@ class Api::V1::ProfilesController < Api::BaseController
       :display_name,
       :avatar,
       :message_signature,
-      :message_signature_enabled,
       ui_settings: {}
     )
   end
diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index 189d1c198..7079614c1 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -138,6 +138,7 @@ export default {
     password,
     password_confirmation,
     displayName,
+    avatar,
     ...profileAttributes
   }) {
     const formData = new FormData();
@@ -152,6 +153,9 @@ export default {
       formData.append('profile[password]', password);
       formData.append('profile[password_confirmation]', password_confirmation);
     }
+    if (avatar) {
+      formData.append('profile[avatar]', avatar);
+    }
     return axios.put(endPoints('profileUpdate').url, formData);
   },
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
index 4343b772d..e08e4fdee 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
@@ -89,7 +89,6 @@ export default {
       try {
         await this.$store.dispatch('updateProfile', {
           message_signature: this.messageSignature,
-          message_signature_enabled: true,
         });
         this.errorMessage = this.$t(
           'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.API_SUCCESS'
diff --git a/app/models/super_admin.rb b/app/models/super_admin.rb
index 2ce658000..f41610ee4 100644
--- a/app/models/super_admin.rb
+++ b/app/models/super_admin.rb
@@ -2,35 +2,34 @@
 #
 # Table name: users
 #
-#  id                        :integer          not null, primary key
-#  availability              :integer          default("online")
-#  confirmation_sent_at      :datetime
-#  confirmation_token        :string
-#  confirmed_at              :datetime
-#  current_sign_in_at        :datetime
-#  current_sign_in_ip        :string
-#  custom_attributes         :jsonb
-#  display_name              :string
-#  email                     :string
-#  encrypted_password        :string           default(""), not null
-#  last_sign_in_at           :datetime
-#  last_sign_in_ip           :string
-#  message_signature         :text
-#  message_signature_enabled :boolean          default(FALSE), not null
-#  name                      :string           not null
-#  provider                  :string           default("email"), not null
-#  pubsub_token              :string
-#  remember_created_at       :datetime
-#  reset_password_sent_at    :datetime
-#  reset_password_token      :string
-#  sign_in_count             :integer          default(0), not null
-#  tokens                    :json
-#  type                      :string
-#  ui_settings               :jsonb
-#  uid                       :string           default(""), not null
-#  unconfirmed_email         :string
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  id                     :integer          not null, primary key
+#  availability           :integer          default("online")
+#  confirmation_sent_at   :datetime
+#  confirmation_token     :string
+#  confirmed_at           :datetime
+#  current_sign_in_at     :datetime
+#  current_sign_in_ip     :string
+#  custom_attributes      :jsonb
+#  display_name           :string
+#  email                  :string
+#  encrypted_password     :string           default(""), not null
+#  last_sign_in_at        :datetime
+#  last_sign_in_ip        :string
+#  message_signature      :text
+#  name                   :string           not null
+#  provider               :string           default("email"), not null
+#  pubsub_token           :string
+#  remember_created_at    :datetime
+#  reset_password_sent_at :datetime
+#  reset_password_token   :string
+#  sign_in_count          :integer          default(0), not null
+#  tokens                 :json
+#  type                   :string
+#  ui_settings            :jsonb
+#  uid                    :string           default(""), not null
+#  unconfirmed_email      :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index d28c40d6a..cbb06b39a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,35 +2,34 @@
 #
 # Table name: users
 #
-#  id                        :integer          not null, primary key
-#  availability              :integer          default("online")
-#  confirmation_sent_at      :datetime
-#  confirmation_token        :string
-#  confirmed_at              :datetime
-#  current_sign_in_at        :datetime
-#  current_sign_in_ip        :string
-#  custom_attributes         :jsonb
-#  display_name              :string
-#  email                     :string
-#  encrypted_password        :string           default(""), not null
-#  last_sign_in_at           :datetime
-#  last_sign_in_ip           :string
-#  message_signature         :text
-#  message_signature_enabled :boolean          default(FALSE), not null
-#  name                      :string           not null
-#  provider                  :string           default("email"), not null
-#  pubsub_token              :string
-#  remember_created_at       :datetime
-#  reset_password_sent_at    :datetime
-#  reset_password_token      :string
-#  sign_in_count             :integer          default(0), not null
-#  tokens                    :json
-#  type                      :string
-#  ui_settings               :jsonb
-#  uid                       :string           default(""), not null
-#  unconfirmed_email         :string
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  id                     :integer          not null, primary key
+#  availability           :integer          default("online")
+#  confirmation_sent_at   :datetime
+#  confirmation_token     :string
+#  confirmed_at           :datetime
+#  current_sign_in_at     :datetime
+#  current_sign_in_ip     :string
+#  custom_attributes      :jsonb
+#  display_name           :string
+#  email                  :string
+#  encrypted_password     :string           default(""), not null
+#  last_sign_in_at        :datetime
+#  last_sign_in_ip        :string
+#  message_signature      :text
+#  name                   :string           not null
+#  provider               :string           default("email"), not null
+#  pubsub_token           :string
+#  remember_created_at    :datetime
+#  reset_password_sent_at :datetime
+#  reset_password_token   :string
+#  sign_in_count          :integer          default(0), not null
+#  tokens                 :json
+#  type                   :string
+#  ui_settings            :jsonb
+#  uid                    :string           default(""), not null
+#  unconfirmed_email      :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #
 # Indexes
 #
diff --git a/app/views/api/v1/models/_user.json.jbuilder b/app/views/api/v1/models/_user.json.jbuilder
index a2f80e1f4..4fc857ae7 100644
--- a/app/views/api/v1/models/_user.json.jbuilder
+++ b/app/views/api/v1/models/_user.json.jbuilder
@@ -4,7 +4,6 @@ json.available_name resource.available_name
 json.avatar_url resource.avatar_url
 json.confirmed resource.confirmed?
 json.display_name resource.display_name
-json.message_signature_enabled resource.message_signature_enabled
 json.message_signature resource.message_signature
 json.email resource.email
 json.hmac_identifier resource.hmac_identifier if GlobalConfig.get('CHATWOOT_INBOX_HMAC_KEY')['CHATWOOT_INBOX_HMAC_KEY'].present?
diff --git a/app/views/platform/api/v1/models/_user.json.jbuilder b/app/views/platform/api/v1/models/_user.json.jbuilder
index fcc151e02..7cf39416a 100644
--- a/app/views/platform/api/v1/models/_user.json.jbuilder
+++ b/app/views/platform/api/v1/models/_user.json.jbuilder
@@ -4,7 +4,6 @@ json.available_name resource.available_name
 json.avatar_url resource.avatar_url
 json.confirmed resource.confirmed?
 json.display_name resource.display_name
-json.message_signature_enabled resource.message_signature_enabled
 json.message_signature resource.message_signature
 json.email resource.email
 json.id resource.id
diff --git a/db/migrate/20220215060751_remove_message_signature_enabled.rb b/db/migrate/20220215060751_remove_message_signature_enabled.rb
new file mode 100644
index 000000000..e627ba34f
--- /dev/null
+++ b/db/migrate/20220215060751_remove_message_signature_enabled.rb
@@ -0,0 +1,5 @@
+class RemoveMessageSignatureEnabled < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :users, :message_signature_enabled, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5c16d1e87..b1f6775b3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_01_31_081750) do
+ActiveRecord::Schema.define(version: 2022_02_15_060751) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -664,20 +664,6 @@ ActiveRecord::Schema.define(version: 2022_01_31_081750) do
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  create_table "super_admins", force: :cascade do |t|
-    t.string "email", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.datetime "remember_created_at"
-    t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.inet "current_sign_in_ip"
-    t.inet "last_sign_in_ip"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.index ["email"], name: "index_super_admins_on_email", unique: true
-  end
-
   create_table "taggings", id: :serial, force: :cascade do |t|
     t.integer "tag_id"
     t.string "taggable_type"
@@ -759,7 +745,6 @@ ActiveRecord::Schema.define(version: 2022_01_31_081750) do
     t.jsonb "ui_settings", default: {}
     t.jsonb "custom_attributes", default: {}
     t.string "type"
-    t.boolean "message_signature_enabled", default: false, null: false
     t.text "message_signature"
     t.index ["email"], name: "index_users_on_email"
     t.index ["pubsub_token"], name: "index_users_on_pubsub_token", unique: true
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index 77cd77bfe..4f6cfaeb0 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -27,7 +27,6 @@ RSpec.describe 'Profile API', type: :request do
         expect(json_response['access_token']).to eq(agent.access_token.token)
         expect(json_response['custom_attributes']['test']).to eq('test')
         expect(json_response['message_signature']).to be_nil
-        expect(json_response['message_signature_enabled']).to be_falsey
       end
     end
   end
@@ -60,7 +59,7 @@ RSpec.describe 'Profile API', type: :request do
 
       it 'updates the message_signature' do
         put '/api/v1/profile',
-            params: { profile: { name: 'test', message_signature: 'Thanks\nMy Signature', message_signature_enabled: true } },
+            params: { profile: { name: 'test', message_signature: 'Thanks\nMy Signature' } },
             headers: agent.create_new_auth_token,
             as: :json
 
@@ -71,7 +70,6 @@ RSpec.describe 'Profile API', type: :request do
         expect(json_response['name']).to eq(agent.name)
         expect(agent.name).to eq('test')
         expect(json_response['message_signature']).to eq('Thanks\nMy Signature')
-        expect(json_response['message_signature_enabled']).to be_truthy
       end
 
       it 'updates the password when current password is provided' do

From 94a473c9f83c1dacb34fd3930575059aea293419 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 15 Feb 2022 16:16:54 +0530
Subject: [PATCH 093/101] chore: Delayed deploy of direct uploads (#3966)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/builders/messages/message_builder.rb      |  4 +-
 .../api/v1/widget/messages_controller.rb      |  4 +-
 app/controllers/dashboard_controller.rb       |  3 +-
 app/controllers/widgets_controller.rb         |  2 +-
 .../components/widgets/AttachmentsPreview.vue | 15 ++++--
 .../widgets/WootWriter/ReplyBottomPanel.vue   |  4 +-
 .../widgets/conversation/ReplyBox.vue         | 51 +++++++++++--------
 app/javascript/shared/store/globalConfig.js   |  2 +
 app/javascript/widget/api/endPoints.js        |  7 ++-
 .../widget/components/ChatAttachment.vue      | 30 ++++++++---
 config/installation_config.yml                |  3 ++
 ...d_direct_uploads_to_installation_config.rb |  5 ++
 12 files changed, 90 insertions(+), 40 deletions(-)
 create mode 100644 db/migrate/20220207124741_add_direct_uploads_to_installation_config.rb

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 2df286f4a..9c26ccca1 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -29,10 +29,12 @@ class Messages::MessageBuilder
     return if @attachments.blank?
 
     @attachments.each do |uploaded_attachment|
-      @message.attachments.build(
+      attachment = @message.attachments.build(
         account_id: @message.account_id,
         file: uploaded_attachment
       )
+
+      attachment.file_type = file_type(uploaded_attachment&.content_type) if uploaded_attachment.is_a?(ActionDispatch::Http::UploadedFile)
     end
   end
 
diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index a35506d96..c2fa6304b 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -29,10 +29,12 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
     return if params[:message][:attachments].blank?
 
     params[:message][:attachments].each do |uploaded_attachment|
-      @message.attachments.new(
+      attachment = @message.attachments.new(
         account_id: @message.account_id,
         file: uploaded_attachment
       )
+
+      attachment.file_type = helpers.file_type(uploaded_attachment&.content_type) if uploaded_attachment.is_a?(ActionDispatch::Http::UploadedFile)
     end
   end
 
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 783b138af..52c6c87af 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -25,7 +25,8 @@ class DashboardController < ActionController::Base
       'API_CHANNEL_NAME',
       'API_CHANNEL_THUMBNAIL',
       'ANALYTICS_TOKEN',
-      'ANALYTICS_HOST'
+      'ANALYTICS_HOST',
+      'DIRECT_UPLOADS_ENABLED'
     ).merge(app_config)
   end
 
diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index 29c1f97f9..ad7d2e3c0 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -10,7 +10,7 @@ class WidgetsController < ActionController::Base
   private
 
   def set_global_config
-    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'BRAND_NAME', 'WIDGET_BRAND_URL')
+    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'BRAND_NAME', 'WIDGET_BRAND_URL', 'DIRECT_UPLOADS_ENABLED')
   end
 
   def set_web_widget
diff --git a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
index 57797b5f3..250c5c3c6 100644
--- a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
+++ b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
@@ -7,7 +7,7 @@
     >
       <div class="thumb-wrap">
         <img
-          v-if="isTypeImage(attachment.resource.content_type)"
+          v-if="isTypeImage(attachment.resource)"
           class="image-thumb"
           :src="attachment.thumb"
         />
@@ -15,12 +15,12 @@
       </div>
       <div class="file-name-wrap">
         <span class="item">
-          {{ attachment.resource.filename }}
+          {{ fileName(attachment.resource) }}
         </span>
       </div>
       <div class="file-size-wrap">
         <span class="item">
-          {{ formatFileSize(attachment.resource.byte_size) }}
+          {{ formatFileSize(attachment.resource) }}
         </span>
       </div>
       <div class="remove-file-wrap">
@@ -50,12 +50,17 @@ export default {
     onRemoveAttachment(index) {
       this.removeAttachment(index);
     },
-    formatFileSize(size) {
+    formatFileSize(file) {
+      const size = file.byte_size || file.size;
       return formatBytes(size, 0);
     },
-    isTypeImage(type) {
+    isTypeImage(file) {
+      const type = file.content_type || file.type;
       return type.includes('image');
     },
+    fileName(file) {
+      return file.filename || file.name;
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 6481ad57a..5bbd913a9 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -25,7 +25,7 @@
           direct_upload_url: '/rails/active_storage/direct_uploads',
           direct_upload: true,
         }"
-        @input-file="onDirectFileUpload"
+        @input-file="onFileUpload"
       >
         <woot-button
           v-if="showAttachButton"
@@ -134,7 +134,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    onDirectFileUpload: {
+    onFileUpload: {
       type: Function,
       default: () => {},
     },
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 2f9681c22..f7be9f917 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -77,7 +77,7 @@
       :mode="replyType"
       :inbox="inbox"
       :send-button-text="replyButtonLabel"
-      :on-direct-file-upload="onDirectFileUpload"
+      :on-file-upload="onFileUpload"
       :show-file-upload="showFileUpload"
       :toggle-emoji-picker="toggleEmojiPicker"
       :show-emoji-picker="showEmojiPicker"
@@ -179,6 +179,7 @@ export default {
       currentChat: 'getSelectedChat',
       messageSignature: 'getMessageSignature',
       currentUser: 'getCurrentUser',
+      globalConfig: 'globalConfig/get',
     }),
 
     showRichContentEditor() {
@@ -544,6 +545,13 @@ export default {
         isPrivate,
       });
     },
+    onFileUpload(file) {
+      if (this.globalConfig.directUploadsEnabled) {
+        this.onDirectFileUpload(file);
+      } else {
+        this.onIndirectFileUpload(file);
+      }
+    },
     onDirectFileUpload(file) {
       if (!file) {
         return;
@@ -559,13 +567,7 @@ export default {
           if (error) {
             this.showAlert(error);
           } else {
-            this.attachedFiles.push({
-              currentChatId: this.currentChat.id,
-              resource: blob,
-              isPrivate: this.isPrivate,
-              thumb: null,
-              blobSignedId: blob.signed_id,
-            });
+            this.attachFile({ file, blob });
           }
         });
       } else {
@@ -576,22 +578,12 @@ export default {
         );
       }
     },
-    onFileUpload(file) {
+    onIndirectFileUpload(file) {
       if (!file) {
         return;
       }
       if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
-        this.attachedFiles = [];
-        const reader = new FileReader();
-        reader.readAsDataURL(file.file);
-        reader.onloadend = () => {
-          this.attachedFiles.push({
-            currentChatId: this.currentChat.id,
-            resource: file,
-            isPrivate: this.isPrivate,
-            thumb: reader.result,
-          });
-        };
+        this.attachFile({ file });
       } else {
         this.showAlert(
           this.$t('CONVERSATION.FILE_SIZE_LIMIT', {
@@ -600,6 +592,19 @@ export default {
         );
       }
     },
+    attachFile({ blob, file }) {
+      const reader = new FileReader();
+      reader.readAsDataURL(file.file);
+      reader.onloadend = () => {
+        this.attachedFiles.push({
+          currentChatId: this.currentChat.id,
+          resource: blob || file,
+          isPrivate: this.isPrivate,
+          thumb: reader.result,
+          blobSignedId: blob ? blob.signed_id : undefined,
+        });
+      };
+    },
     removeAttachment(itemIndex) {
       this.attachedFiles = this.attachedFiles.filter(
         (item, index) => itemIndex !== index
@@ -619,7 +624,11 @@ export default {
       if (this.attachedFiles && this.attachedFiles.length) {
         messagePayload.files = [];
         this.attachedFiles.forEach(attachment => {
-          messagePayload.files.push(attachment.blobSignedId);
+          if (this.globalConfig.directUploadsEnabled) {
+            messagePayload.files.push(attachment.blobSignedId);
+          } else {
+            messagePayload.files.push(attachment.resource.file);
+          }
         });
       }
 
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index 69117179a..9082db4ac 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -5,6 +5,7 @@ const {
   BRAND_NAME: brandName,
   CHATWOOT_INBOX_TOKEN: chatwootInboxToken,
   CREATE_NEW_ACCOUNT_FROM_DASHBOARD: createNewAccountFromDashboard,
+  DIRECT_UPLOADS_ENABLED: directUploadsEnabled,
   DISPLAY_MANIFEST: displayManifest,
   INSTALLATION_NAME: installationName,
   LOGO_THUMBNAIL: logoThumbnail,
@@ -21,6 +22,7 @@ const state = {
   brandName,
   chatwootInboxToken,
   createNewAccountFromDashboard,
+  directUploadsEnabled: directUploadsEnabled === 'true',
   displayManifest,
   installationName,
   logo,
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index 12073c872..df37f2363 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -41,7 +41,12 @@ const sendAttachment = ({ attachment }) => {
   const { file } = attachment;
 
   const formData = new FormData();
-  formData.append('message[attachments][]', file);
+  if (typeof file === 'string') {
+    formData.append('message[attachments][]', file);
+  } else {
+    formData.append('message[attachments][]', file, file.name);
+  }
+
   formData.append('message[referer_url]', referrerURL);
   formData.append('message[timestamp]', timestamp);
   return {
diff --git a/app/javascript/widget/components/ChatAttachment.vue b/app/javascript/widget/components/ChatAttachment.vue
index 1625a41a2..ff37abefd 100755
--- a/app/javascript/widget/components/ChatAttachment.vue
+++ b/app/javascript/widget/components/ChatAttachment.vue
@@ -2,8 +2,11 @@
   <file-upload
     :size="4096 * 2048"
     :accept="allowedFileTypes"
-    :data="{ direct_upload_url: '', direct_upload: true }"
-    @input-file="onDirectFileUpload"
+    :data="{
+      direct_upload_url: '/rails/active_storage/direct_uploads',
+      direct_upload: true,
+    }"
+    @input-file="onFileUpload"
   >
     <button class="icon-button flex items-center justify-center">
       <fluent-icon v-if="!isUploading.image" icon="attach" />
@@ -23,6 +26,7 @@ import {
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import { DirectUpload } from 'activestorage';
+import { mapGetters } from 'vuex';
 
 export default {
   components: { FluentIcon, FileUpload, Spinner },
@@ -36,6 +40,7 @@ export default {
     return { isUploading: false };
   },
   computed: {
+    ...mapGetters({ globalConfig: 'globalConfig/get' }),
     fileUploadSizeLimit() {
       return MAXIMUM_FILE_UPLOAD_SIZE;
     },
@@ -47,6 +52,13 @@ export default {
     getFileType(fileType) {
       return fileType.includes('image') ? 'image' : 'file';
     },
+    async onFileUpload(file) {
+      if (this.globalConfig.directUploadsEnabled) {
+        this.onDirectFileUpload(file);
+      } else {
+        this.onIndirectFileUpload(file);
+      }
+    },
     async onDirectFileUpload(file) {
       if (!file) {
         return;
@@ -68,8 +80,8 @@ export default {
               });
             } else {
               this.onAttach({
-                fileType: blob.content_type,
                 file: blob.signed_id,
+                ...this.getLocalFileAttributes(file),
               });
             }
           });
@@ -85,18 +97,16 @@ export default {
       }
       this.isUploading = false;
     },
-    async onFileUpload(file) {
+    async onIndirectFileUpload(file) {
       if (!file) {
         return;
       }
       this.isUploading = true;
       try {
         if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
-          const thumbUrl = window.URL.createObjectURL(file.file);
           await this.onAttach({
-            fileType: this.getFileType(file.type),
             file: file.file,
-            thumbUrl,
+            ...this.getLocalFileAttributes(file),
           });
         } else {
           window.bus.$emit(BUS_EVENTS.SHOW_ALERT, {
@@ -110,6 +120,12 @@ export default {
       }
       this.isUploading = false;
     },
+    getLocalFileAttributes(file) {
+      return {
+        thumbUrl: window.URL.createObjectURL(file.file),
+        fileType: this.getFileType(file.type),
+      };
+    },
   },
 };
 </script>
diff --git a/config/installation_config.yml b/config/installation_config.yml
index e967618e9..fedf4fc0e 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -44,3 +44,6 @@
   value:
 - name: ANALYTICS_HOST
   value:
+- name: DIRECT_UPLOADS_ENABLED
+  value: false
+  locked: false
diff --git a/db/migrate/20220207124741_add_direct_uploads_to_installation_config.rb b/db/migrate/20220207124741_add_direct_uploads_to_installation_config.rb
new file mode 100644
index 000000000..1261eae64
--- /dev/null
+++ b/db/migrate/20220207124741_add_direct_uploads_to_installation_config.rb
@@ -0,0 +1,5 @@
+class AddDirectUploadsToInstallationConfig < ActiveRecord::Migration[6.1]
+  def change
+    ConfigLoader.new.process
+  end
+end

From a703ef2de62ce497c1175c18106d85079d5296d8 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@chatwoot.com>
Date: Tue, 15 Feb 2022 16:22:42 +0530
Subject: [PATCH 094/101] chore: Update translations (#3980)

---
 .../dashboard/i18n/locale/ar/conversation.json       |  5 ++++-
 .../dashboard/i18n/locale/ar/inboxMgmt.json          |  4 ++--
 .../dashboard/i18n/locale/ar/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/bg/conversation.json       |  3 +++
 .../dashboard/i18n/locale/bg/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/ca/conversation.json       |  3 +++
 .../dashboard/i18n/locale/ca/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/cs/conversation.json       |  3 +++
 .../dashboard/i18n/locale/cs/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/da/conversation.json       |  3 +++
 .../dashboard/i18n/locale/da/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/de/automation.json         |  2 +-
 .../dashboard/i18n/locale/de/conversation.json       |  5 ++++-
 .../dashboard/i18n/locale/de/inboxMgmt.json          |  2 +-
 .../dashboard/i18n/locale/de/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/el/conversation.json       |  5 ++++-
 .../dashboard/i18n/locale/el/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/es/conversation.json       |  3 +++
 .../dashboard/i18n/locale/es/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/fa/conversation.json       |  3 +++
 .../dashboard/i18n/locale/fa/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/fi/conversation.json       |  3 +++
 .../dashboard/i18n/locale/fi/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/fr/conversation.json       |  3 +++
 .../dashboard/i18n/locale/fr/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/he/conversation.json       |  3 +++
 .../dashboard/i18n/locale/he/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/hi/conversation.json       |  3 +++
 .../dashboard/i18n/locale/hi/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/hu/conversation.json       |  3 +++
 .../dashboard/i18n/locale/hu/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/id/conversation.json       |  3 +++
 .../dashboard/i18n/locale/id/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/it/conversation.json       |  3 +++
 .../dashboard/i18n/locale/it/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/ja/conversation.json       |  3 +++
 .../dashboard/i18n/locale/ja/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/ko/conversation.json       |  3 +++
 .../dashboard/i18n/locale/ko/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/lv/conversation.json       |  3 +++
 .../dashboard/i18n/locale/lv/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/ml/conversation.json       |  3 +++
 .../dashboard/i18n/locale/ml/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/ne/conversation.json       |  3 +++
 .../dashboard/i18n/locale/ne/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/nl/conversation.json       |  3 +++
 .../dashboard/i18n/locale/nl/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/no/conversation.json       |  3 +++
 .../dashboard/i18n/locale/no/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/pl/conversation.json       |  3 +++
 .../dashboard/i18n/locale/pl/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/pt/conversation.json       |  3 +++
 .../dashboard/i18n/locale/pt/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/pt_BR/conversation.json    |  3 +++
 .../dashboard/i18n/locale/pt_BR/settings.json        | 12 ++++++++++++
 .../dashboard/i18n/locale/ro/conversation.json       |  3 +++
 .../dashboard/i18n/locale/ro/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/ru/conversation.json       |  5 ++++-
 .../dashboard/i18n/locale/ru/inboxMgmt.json          |  4 ++--
 .../dashboard/i18n/locale/ru/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/sk/conversation.json       |  3 +++
 .../dashboard/i18n/locale/sk/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/sv/conversation.json       |  3 +++
 .../dashboard/i18n/locale/sv/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/ta/conversation.json       |  3 +++
 .../dashboard/i18n/locale/ta/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/th/conversation.json       |  3 +++
 .../dashboard/i18n/locale/th/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/tr/conversation.json       |  3 +++
 .../dashboard/i18n/locale/tr/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/uk/conversation.json       |  3 +++
 .../dashboard/i18n/locale/uk/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/vi/conversation.json       |  3 +++
 .../dashboard/i18n/locale/vi/settings.json           | 12 ++++++++++++
 .../dashboard/i18n/locale/zh_CN/conversation.json    |  3 +++
 .../dashboard/i18n/locale/zh_CN/settings.json        | 12 ++++++++++++
 .../dashboard/i18n/locale/zh_TW/conversation.json    |  3 +++
 .../dashboard/i18n/locale/zh_TW/settings.json        | 12 ++++++++++++
 78 files changed, 565 insertions(+), 10 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index ca6a5eefc..b318378f7 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "زر Shift + Enter لإضافة سطر جديد. ابدأ بزر / للاختيار من الردود السريعة.",
       "PRIVATE_MSG_INPUT": "زر Shift + Enter لإضافة سطر جديد. سيكون هذا مرئياً للموظفين فقط"
     },
@@ -184,7 +187,7 @@
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
+    "FROM": "من",
     "TO": "إلى",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 64a443b2b..5b91d51c2 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -522,10 +522,10 @@
         "LABEL": "الدومين",
         "PLACE_HOLDER": "الدومين"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "التشفير",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
+      "OPEN_SSL_VERIFY_MODE": "فتح وضع التحقق من SSL"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index 996837693..66b73839e 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "الملف الشخصي",
         "NOTE": "عنوان بريدك الإلكتروني هو المعرف الخاص بك الذي ستستخدمه لتسجيل الدخول."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "كلمة المرور",
         "NOTE": "تعديل كلمة المرور الخاصة بك سيعيد ضبط تسجيلات الدخول الخاصة بك في الأجهزة الأخرى.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index db9a16f1d..ffb5bbdc3 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
       "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
     },
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 880d84b95..5cab437e7 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Password",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 05750ad91..a64a71551 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter per a una línia nova. Comença amb '/' per seleccionar una resposta predeterminada.",
       "PRIVATE_MSG_INPUT": "Shift + enter per una línia nova. Això serà visible només per als Agents"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index a237d9c57..7f23c6a9e 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Perfil",
         "NOTE": "La vostra adreça de correu electrònic és la vostra identitat i s'utilitza per iniciar la sessió."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Contrasenya",
         "NOTE": "L'actualització de la contrasenya restableix els vostres inicis de sessió en múltiples dispositius.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index c4e6be04d..6e06dab0a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + zadejte pro nový řádek. Začněte '/' pro výběr zrušené odpovědi.",
       "PRIVATE_MSG_INPUT": "Shift + zadejte pro nový řádek. Toto bude viditelné pouze pro agenty"
     },
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index eb5e6f7c1..e48341b5a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Vaše e-mailová adresa je Vaše identita a používá se k přihlášení."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Heslo",
         "NOTE": "Aktualizace hesla by obnovila vaše přihlašovací údaje na více zařízeních.",
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 0e318f224..1bd9ad4b6 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for ny linje. Start med '/' for at vælge et standardsvar.",
       "PRIVATE_MSG_INPUT": "Shift + enter for ny linje. Dette vil kun være synligt for Agenter"
     },
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 27a8e1a88..bff934391 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Din e-mailadresse er din identitet og bruges til at logge ind."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Adgangskode",
         "NOTE": "Opdatering af din adgangskode vil nulstille dine logins på flere enheder.",
diff --git a/app/javascript/dashboard/i18n/locale/de/automation.json b/app/javascript/dashboard/i18n/locale/de/automation.json
index d81e487e1..138bb1781 100644
--- a/app/javascript/dashboard/i18n/locale/de/automation.json
+++ b/app/javascript/dashboard/i18n/locale/de/automation.json
@@ -3,7 +3,7 @@
     "HEADER": "Automatisierung",
     "HEADER_BTN_TXT": "Automatisierungsregel hinzufügen",
     "LOADING": "Automatisierungsregeln abrufen",
-    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation kann bestehende Prozesse ersetzen und automatisieren, die manuellen Aufwand erfordern. Mit der Automatisierung kannst Du viele Dinge tun, darunter das Hinzufügen von Labels und das Zuweisen von Gesprächen zum besten Agenten. Das Team konzentriert sich also auf das, was es am besten kann, und verbringt weniger Zeit mit manuellen Aufgaben.</p>",
     "ADD": {
       "TITLE": "Automatisierungsregel hinzufügen",
       "SUBMIT": "Erstellen",
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 0dfef63e8..d9043727c 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Nachrichten-Signatur",
+      "ENABLE_SIGN_TOOLTIP": "Signatur aktivieren",
+      "DISABLE_SIGN_TOOLTIP": "Signatur deaktivieren",
       "MSG_INPUT": "Umschalt + Eingabetaste für neue Zeile. Beginnen Sie mit '/', um eine vordefinierte Antwort auszuwählen.",
       "PRIVATE_MSG_INPUT": "Umschalt + Eingabetaste für neue Zeile. Dies ist nur für Agenten sichtbar"
     },
@@ -184,7 +187,7 @@
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
+    "FROM": "Von",
     "TO": "An",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index cde61d8a5..b8fa47f95 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -408,7 +408,7 @@
       "ENABLE_CSAT": "CSAT aktivieren",
       "ENABLE_CSAT_SUB_TEXT": "CSAT(Kundenzufriedenheit) Umfrage aktivieren/deaktivieren nach Abschluss eines Gesprächs",
       "ENABLE_CONTINUITY_VIA_EMAIL": "Konversationskontinuität per E-Mail aktivieren",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Konversationen werden per E-Mail fortgesetzt, wenn die Kontakt-E-Mail-Adresse verfügbar ist.",
       "INBOX_UPDATE_TITLE": "Posteingangseinstellungen",
       "INBOX_UPDATE_SUB_TEXT": "Posteingangseinstellungen aktualisieren",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivieren oder deaktivieren Sie die automatische Zuweisung verfügbarer Agenten für neue Konversationen",
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 5d6afac1c..fce17da1f 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Ihre E-Mail-Adresse ist Ihre Identität und wird zum Anmelden verwendet."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Persönliche Nachrichtensignatur",
+        "NOTE": "Erstelle eine persönliche Nachrichtensignatur, die allen Nachrichten hinzugefügt wird, die Du von der Plattform sendest. Verwende den Rich-Content-Editor, um eine stark personalisierte Signatur zu erstellen.",
+        "BTN_TEXT": "Nachrichten-Signatur speichern",
+        "API_ERROR": "Signatur konnte nicht gespeichert werden! Versuch es noch einmal",
+        "API_SUCCESS": "Signatur erfolgreich gespeichert"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Nachrichten-Signatur",
+        "ERROR": "Nachrichten-Signatur darf nicht leer sein",
+        "PLACEHOLDER": "Füge hier Deine persönliche Nachrichtensignatur ein."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Passwort",
         "NOTE": "Durch das Aktualisieren Ihres Kennworts werden Ihre Anmeldungen auf mehreren Geräten zurückgesetzt.",
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index 1597de4a2..d12c4009b 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter για νέα γραμμή. Ξεκινήστε με '/' για να επιλέξτε Τυποποιημένη Απάντηση.",
       "PRIVATE_MSG_INPUT": "Shift + enter για νέα γραμμή. Το κείμενο θα μπορούν να το δουν μόνο οι υπόλοιποι πράκτορες."
     },
@@ -184,7 +187,7 @@
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
+    "FROM": "Από",
     "TO": "Προς",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 5fef1a0e1..c724d0369 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Προφίλ",
         "NOTE": "Η διεύθυνση email είναι η ταυτότητά σας και χρησιμοποιείται για την είσοδο (login) σας."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Κωδικός",
         "NOTE": "Η ενημέρωση του κωδικού κα επαναφέρει τα logins σε όλες τις συσκευές που έχετε συνδεθεί.",
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 00e09ace0..ee003e25a 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for new line. Comience con '/' para seleccionar una respuesta predefinida.",
       "PRIVATE_MSG_INPUT": "Mayús + entrar para una nueva línea. Esto será visible sólo para los agentes"
     },
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index a868558d3..13fcd8333 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Perfil",
         "NOTE": "Su dirección de correo electrónico es su identidad y se utiliza para iniciar sesión."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Contraseña",
         "NOTE": "Actualizar tu contraseña restablecería tus entradas en varios dispositivos.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index de2fe16b7..3f9af3d16 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "برای رفتن به سرخط shift+enter و برای استفاده از پیام های ذخیره شده / را بزنید.",
       "PRIVATE_MSG_INPUT": "برای رفتن به سرخط shift+enter را بزنید. این پیام فقط به ایجنت ها نمایش داده میشود"
     },
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 7c177dad3..e7458b936 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "پروفایل",
         "NOTE": "آدرس ایمیل شما هویت شماست و برای ورود به سیستم استفاده می شود."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "رمز عبور",
         "NOTE": "تغییر دادن رمز عبور باعث می‌شود مجبور شوید دوباره به سیستم وارد شوید",
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 8a9e5898c..7d2295142 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Vaihto + enter siirtyäksesi uudelle riville. Aloita '/' valitaksesi tallennettu vastaus.",
       "PRIVATE_MSG_INPUT": "Vaihto + enter siirtyäksesi uudelle riville. Tämä näkyy vain edustajille"
     },
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 240a8b0db..cbc567f1c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profiili",
         "NOTE": "Sähköpostiosoitteesi on identiteettisi ja sitä käytetään sisäänkirjautumiseen."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Salasana",
         "NOTE": "Salasanan vaihtaminen kirjaa sinut ulos muilta laitteilta.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 344898ea4..46b444172 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Maj + entrée pour une nouvelle ligne. Commencez par '/' pour sélectionner une réponse standardisée.",
       "PRIVATE_MSG_INPUT": "Maj + entrée pour une nouvelle ligne. Cela ne sera visible que par les agents"
     },
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 38f0d3bc2..6193c6521 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Votre adresse de courriel est votre identité et est utilisée pour vous connecter."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Mot de passe",
         "NOTE": "Mettre à jour votre mot de passe réinitialisera vos connexions sur plusieurs appareils.",
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 2dc4cd4b2..d461721d1 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + Enter עבור שורה חדשה. התחל עם '/' כדי לבחור תגובה מוכנה.",
       "PRIVATE_MSG_INPUT": "Shift + Enter עבור שורה חדשה. זה יהיה גלוי רק לסוכנים"
     },
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index ec4b734bf..af2a6a259 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "סיסמה",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index 77a273ead..2293704d8 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
       "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
     },
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 4de2ffb74..68c37ca7e 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Password",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 575891ef4..77ff33c0a 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter új sorért. Kezdj a '/'-el mentett válasz kiválasztásához.",
       "PRIVATE_MSG_INPUT": "Shift + enter új sorért. Ezt csak ügynökök láthatják"
     },
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 099a0b881..3ee5ff315 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Az e-mailcímed az identitásod és a belépésre használhatod."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Jelszó",
         "NOTE": "A jelszó frissítása minden beléptetett eszközt kiléptet.",
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 12ee9f0ab..ede999030 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter untuk baris baru. Mulailah dengan '/' untuk memilih Canned Response.",
       "PRIVATE_MSG_INPUT": "Shift + enter untuk baris baru. Ini hanya akan terlihat oleh Agen"
     },
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index e66ac46f8..f54bade9e 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Alamat email Anda adalah identitas Anda dan digunakan untuk masuk."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Kata Sandi",
         "NOTE": "Memperbarui kata sandi Anda akan mengatur ulang login Anda di beberapa perangkat.",
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index 1d8e6d340..3501097e4 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "MAIUSC + INVIO per la nuova linea. Inizia con '/' per selezionare una risposta predefinita.",
       "PRIVATE_MSG_INPUT": "MAIUSC + INVIO per nuova linea. Questo sarà visibile solo agli agenti"
     },
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index a9135ac4f..06aadee51 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profilo",
         "NOTE": "Il tuo indirizzo email è la tua identità e viene utilizzato per l'accesso."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Password",
         "NOTE": "Aggiornare la tua password reimposterà i tuoi accessi in più dispositivi.",
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 58c093c4c..6cf67e660 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + Enter で新しい行を作成します。「/」で開始すると、定型文回答を選択できます。",
       "PRIVATE_MSG_INPUT": "Shift + Enter で新しい行を作成します。これは担当者にのみ表示されます。"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index effbe6f46..ed1d00a0c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "プロフィール",
         "NOTE": "あなたのメールアドレスはあなたのIDであり、ログインに使用されます。"
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "パスワード",
         "NOTE": "パスワードを更新すると、複数のデバイスでログインがリセットされます。",
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index f014a3cd6..1d3b96e22 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "줄바꿈을 하시려면 Shift + enter 클릭하십시오. '/'로 시작하여 미리 준비된 답변을 사용할 수 있습니다.",
       "PRIVATE_MSG_INPUT": "줄바꿈을 하시려면 Shift + enter 클릭하십시오. 에이전트만 볼 수 있습니다."
     },
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 2e255cc37..b9753a481 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "프로필",
         "NOTE": "당신의 이메일 주소는 당신의 신분이고 로그인에 사용됩니다."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "비밀번호",
         "NOTE": "암호를 업데이트하면 여러 장치의 로그인이 재설정됩니다.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index 77a273ead..2293704d8 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
       "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
     },
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 4de2ffb74..68c37ca7e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Password",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index c6bfca4b4..68ca4149e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "പുതിയ ലൈനിനു വേണ്ടി ഷിഫ്റ്റ് + എന്റർ അടിക്കുക. ഒരു ക്യാൻഡ് പ്രതികരണം തിരഞ്ഞു എടുക്കാൻ വേണ്ടി '/ ' വച്ച് ടൈപ്പ് ചെയ്തു തുടങ്ങുക.",
       "PRIVATE_MSG_INPUT": "പുതിയ ലൈനിനു വേണ്ടി ഷിഫ്റ്റ് + എന്റർ അടിക്കുക. ഇത് ഏജന്റുമാർക്ക് മാത്രമേ ദൃശ്യമാകൂ"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index f952d364c..701224d61 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "പ്രൊഫൈൽ",
         "NOTE": "നിങ്ങളുടെ ഇമെയിൽ വിലാസം നിങ്ങളുടെ ഐഡന്റിറ്റിയാണ്, ഒപ്പം ലോഗിൻ ചെയ്യാൻ ഇതാണ്  ഉപയോഗിക്കേണ്ടത്."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "പാസ്‌വേഡ്",
         "NOTE": "നിങ്ങളുടെ പാസ്‌വേഡ് അപ്‌ഡേറ്റ് ചെയ്യുന്നത് ഒന്നിലധികം ഉപകരണങ്ങളിൽ നിങ്ങളുടെ ലോഗിനുകൾ പുനഃസജ്ജീകരിക്കും.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 769d1530f..7e619ef55 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
       "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index c0b29c849..e6d65dc55 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Password",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index 0ff7fda12..85230ee2c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter voor nieuwe regel. Begin met '/' om een standaard antwoord te selecteren.",
       "PRIVATE_MSG_INPUT": "Shift + nieuwe regel invoeren. Dit is alleen zichtbaar voor medewerkers"
     },
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 7031aad4e..106850332 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profiel",
         "NOTE": "Uw e-mailadres is uw identiteit en wordt gebruikt om in te loggen."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Wachtwoord",
         "NOTE": "Het bijwerken van uw wachtwoord zou uw logins op meerdere apparaten opnieuw instellen.",
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 8fef083f3..e9e8f0018 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter for ny linje. Start med '/' for å velge et forhåndslagd svar.",
       "PRIVATE_MSG_INPUT": "Skift + enter for ny linje. Dette vil kun være synlig for agenter"
     },
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index afebcd787..e042c0506 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Din e-postadresse er din identitet og brukes til å logge inn."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Passord",
         "NOTE": "Oppdatering av passordet ditt nullstiller logger deg ut på andre enheter.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 6b7550f73..58f06be6f 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter dla nowej linii. Zacznij od '/' aby wybrać Gotową odpowiedź.",
       "PRIVATE_MSG_INPUT": "Shift + wprowadź dla nowej linii. Będzie to widoczne tylko dla agentów"
     },
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index ece7269ed..f65ef8e6d 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Twój adres e-mail jest Twoją tożsamością i jest używany do logowania."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Hasło",
         "NOTE": "Aktualizacja hasła spowoduje zresetowanie logowania na wielu urządzeniach.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 6f3e3862e..86fd472dd 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter para nova linha. Comece com '/' para selecionar uma Resposta Pronta.",
       "PRIVATE_MSG_INPUT": "Shift + Enter para a nova linha. Isto será visível apenas para Agentes"
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 5e3186761..2687f8167 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Perfil",
         "NOTE": "Seu endereço de e-mail é sua identidade e é usado para entrar."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Palavra-passe",
         "NOTE": "Atualizar sua senha irá redefinir seus logins em vários dispositivos.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 943fae04d..ae3c77feb 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter para nova linha. Digite '/' para atalhos.",
       "PRIVATE_MSG_INPUT": "A mensagem será visível apenas para agentes"
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index e786eba18..c5c439acb 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Perfil",
         "NOTE": "Seu endereço de e-mail é sua identidade e é usado para fazer login."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Senha",
         "NOTE": "A atualização da sua senha redefiniria o seu login em vários dispositivos.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index 0af5f7580..217d756e2 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter pentru linie nouă. Începe cu '/' pentru a selecta un răspuns predeterminat.",
       "PRIVATE_MSG_INPUT": "Shift + enter pentru linie nouă. Acest lucru va fi vizibil doar pentru Agenți"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 5ab34685c..b98c66c1a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Adresa ta de email este identitatea ta și este folosită pentru a te autentifica."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Parola",
         "NOTE": "Actualizarea parolei ar reseta autentificările pe mai multe dispozitive.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 320e5ee7c..0162712a7 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Подпись сообщения",
+      "ENABLE_SIGN_TOOLTIP": "Включить подпись",
+      "DISABLE_SIGN_TOOLTIP": "Отключить подпись",
       "MSG_INPUT": "Shift + enter чтобы начать новую строку. Начните с '/', чтобы выбрать шаблонный ответ.",
       "PRIVATE_MSG_INPUT": "Shift + enter для новой строки. Это будет видно только Операторам"
     },
@@ -184,7 +187,7 @@
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
+    "FROM": "От",
     "TO": "Кому",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 5bfbf7bc9..75bb1b2dc 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -522,10 +522,10 @@
         "LABEL": "Домен",
         "PLACE_HOLDER": "Домен"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "Шифрование",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
+      "OPEN_SSL_VERIFY_MODE": "Режим проверки Open SSL"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 0d2a87558..640c5ea27 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Профиль",
         "NOTE": "Адрес электронной почты используется для входа."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Подпись личных сообщений",
+        "NOTE": "Создайте подпись для личных сообщений, которая будет добавлена ко всем сообщениям, которые вы отправляете из платформы. Используйте редактор контента для создания персональной подписи.",
+        "BTN_TEXT": "Сохранить подпись",
+        "API_ERROR": "Не удалось сохранить подпись! Повторите попытку",
+        "API_SUCCESS": "Подпись успешно сохранена"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Подпись для сообщений",
+        "ERROR": "Подпись не может быть пустой",
+        "PLACEHOLDER": "Вставьте подпись для ваших сообщений здесь."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Пароль",
         "NOTE": "Обновление пароля сбросит вашу авторизацию на всех устройствах.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index eed52bdc8..c7842b20c 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter pre nový riadok. Ak chcete vybrať Uloženú odpoveď, začnite klávesou '/'.",
       "PRIVATE_MSG_INPUT": "Shift + enter pre nový riadok. Toto bude viditeľné len pre agentov"
     },
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 679175c70..4a88a6d63 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Password",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 6849485e7..25deef548 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Skift + Enter för ny rad. Börja med '/' för att välja en svarsmall.",
       "PRIVATE_MSG_INPUT": "Skift + Enter för ny rad. Detta kommer endast att vara synligt för agenter"
     },
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 973cad51f..93d2df677 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "Din e-postadress är din identitet och används för att logga in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Lösenord",
         "NOTE": "Uppdatering av ditt lösenord skulle återställa dina inloggningar på flera enheter.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index 1af131809..47ed402e6 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "புதிய வரிக்கு Shift + Enter ஐ அழுத்தவும். பதிவு செய்யப்பட்ட பதிலைத் தேர்ந்தெடுக்க '/' உடன் தொடங்கவும்.",
       "PRIVATE_MSG_INPUT": "புதிய வரிக்கு Shift + Enter ஐ அழுத்தவும். இது ஏஜென்ட்களுக்கு மட்டுமே தெரியும்"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 01c2d4c8e..a62f93c49 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "சுயவிவரம்",
         "NOTE": "உங்கள் ஈ-மெயில் முகவரியே உங்கள் அடையாளம் மற்றும் உள்நுழையவும் பயன்படுகிறது."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "பாஸ்வேர்ட்",
         "NOTE": "உங்கள் பாஸ்வேர்டைப் புதுப்பிப்பது உங்கள் உள்நுழைவுகளை பல சாதனங்களில் மீட்டமைக்கும்.",
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index 8ea0b1ace..b60ead9b7 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter สำหรับบรรทัดใหม่ เริ่มต้นด้วย '/' เพื่อเลือกคำตอบสำเร็จรูป",
       "PRIVATE_MSG_INPUT": "Shift + enter สำหรับบรรทัดใหม่ สิ่งนี้จะปรากฏแก่พนักงานเท่านั้น"
     },
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 96b74e1e5..0bb64f085 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profile",
         "NOTE": "Your email address is your identity and is used to log in."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "หรัสผ่าน",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index edf795719..240bc67f4 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Yeni satır için Shift + enter. Bir Hazır Yanıt seçmek için \"/\" ile başlayın.",
       "PRIVATE_MSG_INPUT": "Yeni satır için Shift + enter. Bu yalnızca Temsilciler tarafından görülebilir"
     },
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 938010030..d6c8fcb0a 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Profil",
         "NOTE": "E-posta adresiniz kimliğinizdir ve oturum açmak için kullanılır."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Parola",
         "NOTE": "Parolanızı güncellemek, giriş bilgilerinizi birden fazla cihazda sıfırlar.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 72ad9fda4..89a4dd579 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + Enter для нового рядка. Для вибору швидкої відповіді, уведіть '/'.",
       "PRIVATE_MSG_INPUT": "Shift + Enter для нового рядка. Видиме лише для співробітників"
     },
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 58156da8d..afd41b369 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Анкета",
         "NOTE": "Ваша електронна адреса - це ваша ідентифікація і використовується для входу."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Пароль",
         "NOTE": "Оновлення вашого пароля призведе до скидання ваших записів про вхід на інших пристроях.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index c11d7f70c..acf046603 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "Shift + enter cho dòng mới. Bắt đầu với '/' để chọn Câu trả lời soạn trước.",
       "PRIVATE_MSG_INPUT": "Shift + enter cho dòng mới. Điều này sẽ chỉ hiển thị cho Đại lý"
     },
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 49fb52958..85faa1430 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "Hồ sơ cá nhân",
         "NOTE": "Địa chỉ email của bạn là danh tính của bạn và được sử dụng để đăng nhập."
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "Mật khẩu",
         "NOTE": "Cập nhật mật khẩu của bạn sẽ đặt lại thông tin đăng nhập của bạn trên nhiều thiết bị.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 17be79cbe..e40b79cd8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "输入“/”开始选择快捷回复",
       "PRIVATE_MSG_INPUT": "Shift + 输入新行。这只对客服可见"
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 93c07e49f..5c74e869d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "个人信息",
         "NOTE": "您的电子邮件地址是您的身份并用于登录。"
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "密码",
         "NOTE": "更新您的密码会在多个设备中重置您的登录信息。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 50da39de5..cc85b9004 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -57,6 +57,9 @@
       }
     },
     "FOOTER": {
+      "MESSAGE_SIGN_TOOLTIP": "Message signature",
+      "ENABLE_SIGN_TOOLTIP": "Enable signature",
+      "DISABLE_SIGN_TOOLTIP": "Disable signature",
       "MSG_INPUT": "輸入“/”開始選擇快捷回覆",
       "PRIVATE_MSG_INPUT": "Shift + 輸入新行。這只對客服可以看見"
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index c315314cf..c44390ec3 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -19,6 +19,18 @@
         "TITLE": "個人資訊",
         "NOTE": "您的電子信箱地址是您的身份並用於登入。"
       },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
       "PASSWORD_SECTION": {
         "TITLE": "密碼",
         "NOTE": "更新您的密碼會在多個設備中重置您的登入資訊。",

From e6f8895c1bfc1ef7dfb33f0b677bff8a0ff6218b Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswin@chatwoot.com>
Date: Tue, 15 Feb 2022 03:40:49 -0800
Subject: [PATCH 095/101] feat: Group by filter in reports (#3973)

---
 .codeclimate.yml                              |  1 +
 app/builders/v2/report_builder.rb             | 14 ++-
 .../api/v2/accounts/reports_controller.rb     |  6 +-
 app/javascript/dashboard/api/reports.js       |  8 +-
 .../dashboard/i18n/locale/en/report.json      | 19 ++++-
 .../settings/reports/CsatResponses.vue        |  6 +-
 .../dashboard/settings/reports/Index.vue      | 85 ++++++++++++++++---
 ...teRangeSelector.vue => FilterSelector.vue} | 60 ++++++++++++-
 .../reports/components/ReportFilters.vue      | 56 +++++++++++-
 .../reports/components/WootReports.vue        | 66 ++++++++++++--
 .../dashboard/settings/reports/constants.js   |  6 ++
 .../dashboard/store/modules/reports.js        |  6 +-
 config/locales/en.yml                         |  1 +
 spec/builders/v2/report_builder_spec.rb       | 44 ++++++++++
 14 files changed, 343 insertions(+), 35 deletions(-)
 rename app/javascript/dashboard/routes/dashboard/settings/reports/components/{DateRangeSelector.vue => FilterSelector.vue} (61%)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/constants.js

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 2799086e3..c9910f9ed 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -49,3 +49,4 @@ exclude_patterns:
   - 'app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js'
   - 'app/javascript/dashboard/routes/dashboard/settings/automation/constants.js'
   - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
+  - 'app/javascript/dashboard/routes/dashboard/settings/reports/constants.js'
diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
index 82e6ce94c..c2900c7e6 100644
--- a/app/builders/v2/report_builder.rb
+++ b/app/builders/v2/report_builder.rb
@@ -2,6 +2,8 @@ class V2::ReportBuilder
   include DateRangeHelper
   attr_reader :account, :params
 
+  DEFAULT_GROUP_BY = 'day'.freeze
+
   def initialize(account, params)
     @account = account
     @params = params
@@ -64,26 +66,30 @@ class V2::ReportBuilder
 
   def conversations_count
     scope.conversations
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end
 
   def incoming_messages_count
     scope.messages.incoming.unscope(:order)
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end
 
   def outgoing_messages_count
     scope.messages.outgoing.unscope(:order)
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end
 
   def resolutions_count
     scope.conversations
          .resolved
-         .group_by_day(:created_at, range: range, default_value: 0)
+         .group_by_period(params[:group_by] || DEFAULT_GROUP_BY,
+                          :created_at, range: range, default_value: 0, permit: %w[day week month year])
          .count
   end
 
diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index 4fabd587e..9801d760d 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -46,7 +46,8 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
       type: params[:type].to_sym,
       since: params[:since],
       until: params[:until],
-      id: params[:id]
+      id: params[:id],
+      group_by: params[:group_by]
     }
   end
 
@@ -56,7 +57,8 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
       type: params[:type].to_sym,
       since: params[:since],
       until: params[:until],
-      id: params[:id]
+      id: params[:id],
+      group_by: params[:group_by]
     }
   end
 
diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index faeee779f..dbb2bf08d 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -6,15 +6,15 @@ class ReportsAPI extends ApiClient {
     super('reports', { accountScoped: true, apiVersion: 'v2' });
   }
 
-  getReports(metric, since, until, type = 'account', id) {
+  getReports(metric, since, until, type = 'account', id, group_by) {
     return axios.get(`${this.url}`, {
-      params: { metric, since, until, type, id },
+      params: { metric, since, until, type, id, group_by },
     });
   }
 
-  getSummary(since, until, type = 'account', id) {
+  getSummary(since, until, type = 'account', id, group_by) {
     return axios.get(`${this.url}/summary`, {
-      params: { since, until, type, id },
+      params: { since, until, type, id, group_by },
     });
   }
 
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index 4afd63b61..229c7b068 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -59,7 +59,24 @@
     "CUSTOM_DATE_RANGE": {
       "CONFIRM": "Apply",
       "PLACEHOLDER": "Select date range"
-    }
+    },
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
+    "GROUP_BY_DAY_OPTIONS": [{ "id": 1, "groupBy": "Day" }],
+    "GROUP_BY_WEEK_OPTIONS": [
+      { "id": 1, "groupBy": "Day" },
+      { "id": 2, "groupBy": "Week" }
+    ],
+    "GROUP_BY_MONTH_OPTIONS": [
+      { "id": 1, "groupBy": "Day" },
+      { "id": 2, "groupBy": "Week" },
+      { "id": 3, "groupBy": "Month" }
+    ],
+    "GROUP_BY_YEAR_OPTIONS": [
+      { "id": 1, "groupBy": "Day" },
+      { "id": 2, "groupBy": "Week" },
+      { "id": 3, "groupBy": "Month" },
+      { "id": 4, "groupBy": "Year" }
+    ]
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
index 184d85a99..b893b763e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="column content-box">
-    <report-date-range-selector @date-range-change="onDateRangeChange" />
+    <report-filter-selector @date-range-change="onDateRangeChange" />
     <csat-metrics />
     <csat-table :page-index="pageIndex" @page-change="onPageNumberChange" />
   </div>
@@ -8,14 +8,14 @@
 <script>
 import CsatMetrics from './components/CsatMetrics';
 import CsatTable from './components/CsatTable';
-import ReportDateRangeSelector from './components/DateRangeSelector';
+import ReportFilterSelector from './components/FilterSelector';
 
 export default {
   name: 'CsatResponses',
   components: {
     CsatMetrics,
     CsatTable,
-    ReportDateRangeSelector,
+    ReportFilterSelector,
   },
   data() {
     return { pageIndex: 1, from: 0, to: 0 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index e55259c2c..1f2839048 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -9,7 +9,12 @@
       {{ $t('REPORT.DOWNLOAD_AGENT_REPORTS') }}
     </woot-button>
 
-    <report-date-range-selector @date-range-change="onDateRangeChange" />
+    <report-filter-selector
+      :selected-group-by-filter="selectedGroupByFilter"
+      :filter-items-list="filterItemsList"
+      @date-range-change="onDateRangeChange"
+      @filter-change="onFilterChange"
+    />
     <div class="row">
       <woot-report-stats-card
         v-for="(metric, index) in metrics"
@@ -41,7 +46,8 @@
 import { mapGetters } from 'vuex';
 import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
-import ReportDateRangeSelector from './components/DateRangeSelector';
+import ReportFilterSelector from './components/FilterSelector';
+import { GROUP_BY_FILTER } from './constants';
 
 const REPORTS_KEYS = {
   CONVERSATIONS: 'conversations_count',
@@ -54,10 +60,17 @@ const REPORTS_KEYS = {
 
 export default {
   components: {
-    ReportDateRangeSelector,
+    ReportFilterSelector,
   },
   data() {
-    return { from: 0, to: 0, currentSelection: 0 };
+    return {
+      from: 0,
+      to: 0,
+      currentSelection: 0,
+      groupBy: GROUP_BY_FILTER[1],
+      filterItemsList: this.$t('REPORT.GROUP_BY_DAY_OPTIONS'),
+      selectedGroupByFilter: {},
+    };
   },
   computed: {
     ...mapGetters({
@@ -69,9 +82,28 @@ export default {
         return {};
       }
       if (!this.accountReport.data.length) return {};
-      const labels = this.accountReport.data.map(element =>
-        format(fromUnixTime(element.timestamp), 'dd/MMM')
-      );
+      const labels = this.accountReport.data.map(element => {
+        if (this.groupBy.period === GROUP_BY_FILTER[2].period) {
+          let week_date = new Date(fromUnixTime(element.timestamp));
+          const first_day = week_date.getDate() - week_date.getDay();
+          const last_day = first_day + 6;
+
+          const week_first_date = new Date(week_date.setDate(first_day));
+          const week_last_date = new Date(week_date.setDate(last_day));
+
+          return `${format(week_first_date, 'dd/MM/yy')} - ${format(
+            week_last_date,
+            'dd/MM/yy'
+          )}`;
+        }
+        if (this.groupBy.period === GROUP_BY_FILTER[3].period) {
+          return format(fromUnixTime(element.timestamp), 'MMM-yyyy');
+        }
+        if (this.groupBy.period === GROUP_BY_FILTER[4].period) {
+          return format(fromUnixTime(element.timestamp), 'yyyy');
+        }
+        return format(fromUnixTime(element.timestamp), 'dd-MMM-yyyy');
+      });
       const data = this.accountReport.data.map(element => element.value);
       return {
         labels,
@@ -102,16 +134,21 @@ export default {
   },
   methods: {
     fetchAllData() {
-      const { from, to } = this;
-      this.$store.dispatch('fetchAccountSummary', { from, to });
+      const { from, to, groupBy } = this;
+      this.$store.dispatch('fetchAccountSummary', {
+        from,
+        to,
+        groupBy: groupBy.period,
+      });
       this.fetchChartData();
     },
     fetchChartData() {
-      const { from, to } = this;
+      const { from, to, groupBy } = this;
       this.$store.dispatch('fetchAccountReport', {
         metric: this.metrics[this.currentSelection].KEY,
         from,
         to,
+        groupBy: groupBy.period,
       });
     },
     downloadAgentReports() {
@@ -126,11 +163,37 @@ export default {
       this.currentSelection = index;
       this.fetchChartData();
     },
-    onDateRangeChange({ from, to }) {
+    onDateRangeChange({ from, to, groupBy }) {
       this.from = from;
       this.to = to;
+      this.filterItemsList = this.fetchFilterItems(groupBy);
+      const filterItems = this.filterItemsList.filter(
+        item => item.id === this.groupBy.id
+      );
+      if (filterItems.length > 0) {
+        this.selectedGroupByFilter = filterItems[0];
+      } else {
+        this.selectedGroupByFilter = this.filterItemsList[0];
+        this.groupBy = GROUP_BY_FILTER[this.selectedGroupByFilter.id];
+      }
       this.fetchAllData();
     },
+    onFilterChange(payload) {
+      this.groupBy = GROUP_BY_FILTER[payload.id];
+      this.fetchAllData();
+    },
+    fetchFilterItems(group_by) {
+      switch (group_by) {
+        case GROUP_BY_FILTER[2].period:
+          return this.$t('REPORT.GROUP_BY_WEEK_OPTIONS');
+        case GROUP_BY_FILTER[3].period:
+          return this.$t('REPORT.GROUP_BY_MONTH_OPTIONS');
+        case GROUP_BY_FILTER[4].period:
+          return this.$t('REPORT.GROUP_BY_YEAR_OPTIONS');
+        default:
+          return this.$t('REPORT.GROUP_BY_DAY_OPTIONS');
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/DateRangeSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
similarity index 61%
rename from app/javascript/dashboard/routes/dashboard/settings/reports/components/DateRangeSelector.vue
rename to app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
index a3e45ade1..2a1884bac 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/DateRangeSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -23,6 +23,24 @@
       :placeholder="$t('REPORT.CUSTOM_DATE_RANGE.PLACEHOLDER')"
       @change="onChange"
     />
+    <div
+      v-if="notLast7Days"
+      class="small-12 medium-3 pull-right margin-left-small"
+    >
+      <p aria-hidden="true" class="hide">
+        {{ $t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL') }}
+      </p>
+      <multiselect
+        v-model="currentSelectedFilter"
+        track-by="id"
+        label="groupBy"
+        :placeholder="$t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL')"
+        :options="filterItemsList"
+        :allow-empty="false"
+        :show-labels="false"
+        @input="changeFilterSelection"
+      />
+    </div>
   </div>
 </template>
 <script>
@@ -31,16 +49,28 @@ const CUSTOM_DATE_RANGE_ID = 5;
 import subDays from 'date-fns/subDays';
 import startOfDay from 'date-fns/startOfDay';
 import getUnixTime from 'date-fns/getUnixTime';
+import { GROUP_BY_FILTER } from '../constants';
 
 export default {
   components: {
     WootDateRangePicker,
   },
+  props: {
+    filterItemsList: {
+      type: Array,
+      default: () => [],
+    },
+    selectedGroupByFilter: {
+      type: Object,
+      default: () => {},
+    },
+  },
   data() {
     return {
       currentDateRangeSelection: this.$t('REPORT.DATE_RANGE')[0],
       dateRange: this.$t('REPORT.DATE_RANGE'),
       customDateRange: [new Date(), new Date()],
+      currentSelectedFilter: null,
     };
   },
   computed: {
@@ -68,13 +98,38 @@ export default {
       const fromDate = subDays(new Date(), diff);
       return this.fromCustomDate(fromDate);
     },
+    groupBy() {
+      if (this.isDateRangeSelected) {
+        return GROUP_BY_FILTER[4].period;
+      }
+      const groupRange = {
+        0: GROUP_BY_FILTER[1].period,
+        1: GROUP_BY_FILTER[2].period,
+        2: GROUP_BY_FILTER[3].period,
+        3: GROUP_BY_FILTER[3].period,
+        4: GROUP_BY_FILTER[3].period,
+      };
+      return groupRange[this.currentDateRangeSelection.id];
+    },
+    notLast7Days() {
+      return this.groupBy !== GROUP_BY_FILTER[1].period;
+    },
+  },
+  watch: {
+    filterItemsList() {
+      this.currentSelectedFilter = this.selectedGroupByFilter;
+    },
   },
   mounted() {
     this.onDateRangeChange();
   },
   methods: {
     onDateRangeChange() {
-      this.$emit('date-range-change', { from: this.from, to: this.to });
+      this.$emit('date-range-change', {
+        from: this.from,
+        to: this.to,
+        groupBy: this.groupBy,
+      });
     },
     fromCustomDate(date) {
       return getUnixTime(startOfDay(date));
@@ -87,6 +142,9 @@ export default {
       this.customDateRange = value;
       this.onDateRangeChange();
     },
+    changeFilterSelection() {
+      this.$emit('filter-change', this.currentSelectedFilter);
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
index 46071f450..28321cdba 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -127,6 +127,24 @@
       :placeholder="$t('REPORT.CUSTOM_DATE_RANGE.PLACEHOLDER')"
       @change="onChange"
     />
+    <div
+      v-if="notLast7Days"
+      class="small-12 medium-3 pull-right margin-left-small"
+    >
+      <p aria-hidden="true" class="hide">
+        {{ $t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL') }}
+      </p>
+      <multiselect
+        v-model="currentSelectedGroupByFilter"
+        track-by="id"
+        label="groupBy"
+        :placeholder="$t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL')"
+        :options="groupByFilterItemsList"
+        :allow-empty="false"
+        :show-labels="false"
+        @input="changeGroupByFilterSelection"
+      />
+    </div>
   </div>
 </template>
 <script>
@@ -136,6 +154,7 @@ import subDays from 'date-fns/subDays';
 import startOfDay from 'date-fns/startOfDay';
 import getUnixTime from 'date-fns/getUnixTime';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+import { GROUP_BY_FILTER } from '../constants';
 
 export default {
   components: {
@@ -147,10 +166,18 @@ export default {
       type: Array,
       default: () => [],
     },
+    groupByFilterItemsList: {
+      type: Array,
+      default: () => [],
+    },
     type: {
       type: String,
       default: 'agent',
     },
+    selectedGroupByFilter: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -158,6 +185,7 @@ export default {
       currentDateRangeSelection: this.$t('REPORT.DATE_RANGE')[0],
       dateRange: this.$t('REPORT.DATE_RANGE'),
       customDateRange: [new Date(), new Date()],
+      currentSelectedGroupByFilter: null,
     };
   },
   computed: {
@@ -194,19 +222,42 @@ export default {
       };
       return typeLabels[this.type] || this.$t('FORMS.MULTISELECT.SELECT_ONE');
     },
+    groupBy() {
+      if (this.isDateRangeSelected) {
+        return GROUP_BY_FILTER[4].period;
+      }
+      const groupRange = {
+        0: GROUP_BY_FILTER[1].period,
+        1: GROUP_BY_FILTER[2].period,
+        2: GROUP_BY_FILTER[3].period,
+        3: GROUP_BY_FILTER[3].period,
+        4: GROUP_BY_FILTER[3].period,
+      };
+      return groupRange[this.currentDateRangeSelection.id];
+    },
+    notLast7Days() {
+      return this.groupBy !== GROUP_BY_FILTER[1].period;
+    },
   },
   watch: {
     filterItemsList(val) {
       this.currentSelectedFilter = val[0];
       this.changeFilterSelection();
     },
+    groupByFilterItemsList() {
+      this.currentSelectedGroupByFilter = this.selectedGroupByFilter;
+    },
   },
   mounted() {
     this.onDateRangeChange();
   },
   methods: {
     onDateRangeChange() {
-      this.$emit('date-range-change', { from: this.from, to: this.to });
+      this.$emit('date-range-change', {
+        from: this.from,
+        to: this.to,
+        groupBy: this.groupBy,
+      });
     },
     fromCustomDate(date) {
       return getUnixTime(startOfDay(date));
@@ -222,6 +273,9 @@ export default {
       this.customDateRange = value;
       this.onDateRangeChange();
     },
+    changeGroupByFilterSelection() {
+      this.$emit('group-by-filter-change', this.currentSelectedGroupByFilter);
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
index 6b26f94b9..449b0383f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
@@ -12,8 +12,11 @@
       v-if="filterItemsList"
       :type="type"
       :filter-items-list="filterItemsList"
+      :group-by-filter-items-list="groupByfilterItemsList"
+      :selected-group-by-filter="selectedGroupByFilter"
       @date-range-change="onDateRangeChange"
       @filter-change="onFilterChange"
+      @group-by-filter-change="onGroupByFilterChange"
     />
     <div>
       <div v-if="filterItemsList.length" class="row">
@@ -51,6 +54,7 @@
 import ReportFilters from './ReportFilters';
 import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
+import { GROUP_BY_FILTER } from '../constants';
 
 const REPORTS_KEYS = {
   CONVERSATIONS: 'conversations_count',
@@ -88,6 +92,9 @@ export default {
       to: 0,
       currentSelection: 0,
       selectedFilter: null,
+      groupBy: GROUP_BY_FILTER[1],
+      groupByfilterItemsList: this.$t('REPORT.GROUP_BY_DAY_OPTIONS'),
+      selectedGroupByFilter: null,
     };
   },
   computed: {
@@ -105,9 +112,28 @@ export default {
         return {};
       }
       if (!this.accountReport.data.length) return {};
-      const labels = this.accountReport.data.map(element =>
-        format(fromUnixTime(element.timestamp), 'dd/MMM')
-      );
+      const labels = this.accountReport.data.map(element => {
+        if (this.groupBy.period === GROUP_BY_FILTER[2].period) {
+          let week_date = new Date(fromUnixTime(element.timestamp));
+          const first_day = week_date.getDate() - week_date.getDay();
+          const last_day = first_day + 6;
+
+          const week_first_date = new Date(week_date.setDate(first_day));
+          const week_last_date = new Date(week_date.setDate(last_day));
+
+          return `${format(week_first_date, 'dd/MM/yy')} - ${format(
+            week_last_date,
+            'dd/MM/yy'
+          )}`;
+        }
+        if (this.groupBy.period === GROUP_BY_FILTER[3].period) {
+          return format(fromUnixTime(element.timestamp), 'MMM-yyyy');
+        }
+        if (this.groupBy.period === GROUP_BY_FILTER[4].period) {
+          return format(fromUnixTime(element.timestamp), 'yyyy');
+        }
+        return format(fromUnixTime(element.timestamp), 'dd-MMM-yyyy');
+      });
       const data = this.accountReport.data.map(element => element.value);
       return {
         labels,
@@ -148,24 +174,26 @@ export default {
   methods: {
     fetchAllData() {
       if (this.selectedFilter) {
-        const { from, to } = this;
+        const { from, to, groupBy } = this;
         this.$store.dispatch('fetchAccountSummary', {
           from,
           to,
           type: this.type,
           id: this.selectedFilter.id,
+          groupBy: groupBy.period,
         });
         this.fetchChartData();
       }
     },
     fetchChartData() {
-      const { from, to } = this;
+      const { from, to, groupBy } = this;
       this.$store.dispatch('fetchAccountReport', {
         metric: this.metrics[this.currentSelection].KEY,
         from,
         to,
         type: this.type,
         id: this.selectedFilter.id,
+        groupBy: groupBy.period,
       });
     },
     downloadReports() {
@@ -195,9 +223,19 @@ export default {
       this.currentSelection = index;
       this.fetchChartData();
     },
-    onDateRangeChange({ from, to }) {
+    onDateRangeChange({ from, to, groupBy }) {
       this.from = from;
       this.to = to;
+      this.groupByfilterItemsList = this.fetchFilterItems(groupBy);
+      const filterItems = this.groupByfilterItemsList.filter(
+        item => item.id === this.groupBy.id
+      );
+      if (filterItems.length > 0) {
+        this.selectedGroupByFilter = filterItems[0];
+      } else {
+        this.selectedGroupByFilter = this.groupByfilterItemsList[0];
+        this.groupBy = GROUP_BY_FILTER[this.selectedGroupByFilter.id];
+      }
       this.fetchAllData();
     },
     onFilterChange(payload) {
@@ -206,6 +244,22 @@ export default {
         this.fetchAllData();
       }
     },
+    onGroupByFilterChange(payload) {
+      this.groupBy = GROUP_BY_FILTER[payload.id];
+      this.fetchAllData();
+    },
+    fetchFilterItems(group_by) {
+      switch (group_by) {
+        case GROUP_BY_FILTER[2].period:
+          return this.$t('REPORT.GROUP_BY_WEEK_OPTIONS');
+        case GROUP_BY_FILTER[3].period:
+          return this.$t('REPORT.GROUP_BY_MONTH_OPTIONS');
+        case GROUP_BY_FILTER[4].period:
+          return this.$t('REPORT.GROUP_BY_YEAR_OPTIONS');
+        default:
+          return this.$t('REPORT.GROUP_BY_DAY_OPTIONS');
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
new file mode 100644
index 000000000..f285061cb
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
@@ -0,0 +1,6 @@
+export const GROUP_BY_FILTER = {
+  1: { id: 1, period: 'day' },
+  2: { id: 2, period: 'week' },
+  3: { id: 3, period: 'month' },
+  4: { id: 4, period: 'year' },
+};
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 87050bcef..027b2388a 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -43,7 +43,8 @@ export const actions = {
       reportObj.from,
       reportObj.to,
       reportObj.type,
-      reportObj.id
+      reportObj.id,
+      reportObj.groupBy
     ).then(accountReport => {
       let { data } = accountReport;
       data = data.filter(
@@ -68,7 +69,8 @@ export const actions = {
       reportObj.from,
       reportObj.to,
       reportObj.type,
-      reportObj.id
+      reportObj.id,
+      reportObj.groupBy
     )
       .then(accountSummary => {
         commit(types.default.SET_ACCOUNT_SUMMARY, accountSummary.data);
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0804fbcd9..c52b660e8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -57,6 +57,7 @@ en:
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
+    default_group_by: day
 
   notifications:
     notification_title:
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index bcf02f1d8..16fe18f49 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -147,6 +147,18 @@ describe ::V2::ReportBuilder do
         expect(metrics[:avg_resolution_time]).to be 0
         expect(metrics[:resolutions_count]).to be 0
       end
+
+      it 'returns argument error for incorrect group by' do
+        params = {
+          type: :account,
+          since: (Time.zone.today - 3.days).to_time.to_i.to_s,
+          until: Time.zone.today.to_time.to_i.to_s,
+          group_by: 'test'.to_s
+        }
+
+        builder = V2::ReportBuilder.new(account, params)
+        expect { builder.summary }.to raise_error(ArgumentError)
+      end
     end
 
     context 'when report type is label' do
@@ -247,6 +259,38 @@ describe ::V2::ReportBuilder do
         expect(metrics[:avg_resolution_time]).to be 0
         expect(metrics[:resolutions_count]).to be 0
       end
+
+      it 'returns summary for correct group by' do
+        params = {
+          type: :label,
+          id: label_2.id,
+          since: (Time.zone.today - 3.days).to_time.to_i.to_s,
+          until: Time.zone.today.to_time.to_i.to_s,
+          group_by: 'week'.to_s
+        }
+
+        builder = V2::ReportBuilder.new(account, params)
+        metrics = builder.summary
+
+        expect(metrics[:conversations_count]).to be 5
+        expect(metrics[:incoming_messages_count]).to be 5
+        expect(metrics[:outgoing_messages_count]).to be 15
+        expect(metrics[:avg_resolution_time]).to be 0
+        expect(metrics[:resolutions_count]).to be 0
+      end
+
+      it 'returns argument error for incorrect group by' do
+        params = {
+          type: :label,
+          id: label_2.id,
+          since: (Time.zone.today - 3.days).to_time.to_i.to_s,
+          until: Time.zone.today.to_time.to_i.to_s,
+          group_by: 'test'.to_s
+        }
+
+        builder = V2::ReportBuilder.new(account, params)
+        expect { builder.summary }.to raise_error(ArgumentError)
+      end
     end
   end
 end

From 464e12ceb726dea5562ed4a110cf6c47833c5b4e Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswin@chatwoot.com>
Date: Tue, 15 Feb 2022 03:41:28 -0800
Subject: [PATCH 096/101] fix: Update auto reply and hide reply time for email
 inbox (#3985)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/settings/inbox/Settings.vue     |  2 +-
 app/models/message.rb                         | 14 ++++-----
 app/workers/email_reply_worker.rb             |  3 +-
 spec/models/message_spec.rb                   | 29 +++++++++++++++++++
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 645a0990a..31f435a82 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -149,7 +149,7 @@
             :richtext="!textAreaChannels"
           />
         </div>
-        <label class="medium-9 columns settings-item">
+        <label v-if="isAWebWidgetInbox" class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.REPLY_TIME.TITLE') }}
           <select v-model="replyTime">
             <option key="in_a_few_minutes" value="in_a_few_minutes">
diff --git a/app/models/message.rb b/app/models/message.rb
index 7f2655b35..8e2e81307 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -136,6 +136,13 @@ class Message < ApplicationRecord
     I18n.t('conversations.survey.response', link: "#{ENV['FRONTEND_URL']}/survey/responses/#{conversation.uuid}")
   end
 
+  def email_notifiable_message?
+    return false if private? || incoming?
+    return false if template? && %w[input_csat text].exclude?(content_type)
+
+    true
+  end
+
   private
 
   def ensure_content_type
@@ -194,13 +201,6 @@ class Message < ApplicationRecord
     email_notifiable_webwidget? || %w[Email].include?(inbox.inbox_type)
   end
 
-  def email_notifiable_message?
-    return false unless outgoing? || input_csat?
-    return false if private?
-
-    true
-  end
-
   def can_notify_via_mail?
     return unless email_notifiable_message?
     return unless email_notifiable_channel?
diff --git a/app/workers/email_reply_worker.rb b/app/workers/email_reply_worker.rb
index 79e7eb161..dddbae3dd 100644
--- a/app/workers/email_reply_worker.rb
+++ b/app/workers/email_reply_worker.rb
@@ -5,8 +5,7 @@ class EmailReplyWorker
   def perform(message_id)
     message = Message.find(message_id)
 
-    return unless message.outgoing? || message.input_csat?
-    return if message.private?
+    return unless message.email_notifiable_message?
 
     # send the email
     ConversationReplyMailer.with(account: message.account).email_reply(message).deliver_later
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 42fcbf49f..1176b17e2 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -105,4 +105,33 @@ RSpec.describe Message, type: :model do
       expect(message.content_type).to eq 'text'
     end
   end
+
+  context 'when email notifiable message' do
+    let(:message) { build(:message, content_type: nil, account: create(:account)) }
+
+    it 'return false if private message' do
+      message.private = true
+      expect(message.email_notifiable_message?).to be false
+    end
+
+    it 'return false if incoming message' do
+      message.private = false
+      message.message_type = 'incoming'
+      expect(message.email_notifiable_message?).to be false
+    end
+
+    it 'return false if message type is template and content type is not input_csat or text' do
+      message.private = false
+      message.message_type = 'template'
+      message.content_type = 'incoming_email'
+      expect(message.email_notifiable_message?).to be false
+    end
+
+    it 'return true if not private and not incoming and message content type is input_csat or text' do
+      message.private = false
+      message.message_type = 'template'
+      message.content_type = 'text'
+      expect(message.email_notifiable_message?).to be true
+    end
+  end
 end

From 505c93c46748ca014adae079431f3a7617864322 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 15 Feb 2022 17:19:28 +0530
Subject: [PATCH 097/101] revert: "fix: html content is available and mail_part
 empty" (#3986)

Reverts de4e4c6
---
 app/presenters/mail_presenter.rb       |  25 ++---
 spec/fixtures/files/support_1.eml      | 144 -------------------------
 spec/mailboxes/support_mailbox_spec.rb |  23 ----
 3 files changed, 9 insertions(+), 183 deletions(-)
 delete mode 100644 spec/fixtures/files/support_1.eml

diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index bea652eb7..9ab3a5d38 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -27,21 +27,17 @@ class MailPresenter < SimpleDelegator
   end
 
   # returns encoded mail body text_part if available.
-  # returns encoded raw mail body as it is if mail_part not available.
+  # returns encoded mail body as it is if mail_part not available.
   # else returns parsed the html body if contains text/html content.
   def select_body(mail_part)
-    decoded = if mail_part
-                mail_part.decoded
-              else
-                raw_mail_body
-              end
+    return encoded_mail_body unless mail_part
 
-    encoded = encode_to_unicode(decoded)
+    decoded = encode_to_unicode(mail_part.decoded)
 
     if mail.text_part
-      encoded
+      decoded
     elsif html_mail_body?
-      ::HtmlParser.parse_reply(encoded)
+      ::HtmlParser.parse_reply(decoded)
     end
   end
 
@@ -135,15 +131,12 @@ class MailPresenter < SimpleDelegator
   end
 
   def html_mail_body?
-    ((mail.content_type || '').include? 'text/html') || @mail.html_part&.content_type&.include?('text/html')
+    ((mail.content_type || '').include? 'text/html') || @mail.html_part || @mail.html_part.content_type.include?('text/html')
   end
 
-  def text_mail_body?
-    ((mail.content_type || '').include? 'text') || @mail.text_part&.content_type&.include?('text')
-  end
-
-  def raw_mail_body
-    return @mail.body.decoded if html_mail_body? || text_mail_body?
+  # returns mail body if mail content_type is text/plain
+  def encoded_mail_body
+    return encode_to_unicode(@mail.body.decoded) if (@mail.content_type || '').include? 'text/plain'
 
     ''
   end
diff --git a/spec/fixtures/files/support_1.eml b/spec/fixtures/files/support_1.eml
deleted file mode 100644
index c16f461cf..000000000
--- a/spec/fixtures/files/support_1.eml
+++ /dev/null
@@ -1,144 +0,0 @@
-Date: Fri, 11 Feb 2022 05:15:51 +0000
-Mime-Version: 1.0
-Subject: Get Paid to post an article
-From: sony@chatwoot.com
-To: care@example.com
-X-Mailgun-Tag: test1
-X-Mailgun-Track-Clicks: true
-X-Mailgun-Track: true
-X-Mailgun-Track-Opens: true
-Message-Id: <20220211051551.0ac6490aa10da09b@chatwoot.com>
-Content-Type: text/html; charset="ascii"
-Content-Transfer-Encoding: quoted-printable
-
-<!DOCTYPE html>
-<html>
-
-<head>
-<title></title>
-<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8=
-" />
-<meta name=3D"viewport" content=3D"width=3Ddevice-width, initial-scale=
-=3D1">
-<meta http-equiv=3D"X-UA-Compatible" content=3D"IE=3Dedge" />
-<style type=3D"text/css">
-@media screen {
-@font-face {
-font-family: 'Lato';
-font-style: normal;
-font-weight: 400;
-src: local('Lato Regular'), local('Lato-Regular'), url(http=
-s://fonts.gstatic.com/s/lato/v11/qIIYRU-oROkIk8vfvxw6QvesZW2xOQ-xsNqO47m55D=
-A.woff) format('woff');
-}
-
-@font-face {
-font-family: 'Lato';
-font-style: normal;
-font-weight: 700;
-src: local('Lato Bold'), local('Lato-Bold'), url(https://fo=
-nts.gstatic.com/s/lato/v11/qdgUG4U09HnJwhYI-uK18wLUuEpTyoUstqEm5AMlJo4.woff=
-) format('woff');
-}
-
-@font-face {
-font-family: 'Lato';
-font-style: italic;
-font-weight: 400;
-src: local('Lato Italic'), local('Lato-Italic'), url(https:=
-//fonts.gstatic.com/s/lato/v11/RYyZNoeFgb0l7W3Vu1aSWOvvDin1pK8aKteLpeZ5c0A.=
-woff) format('woff');
-}
-
-@font-face {
-font-family: 'Lato';
-font-style: italic;
-font-weight: 700;
-src: local('Lato Bold Italic'), local('Lato-BoldItalic'), u=
-rl(https://fonts.gstatic.com/s/lato/v11/HkF_qI1x_noxlxhrhMQYELO3LdcAZYWl9Si=
-6vvxL-qU.woff) format('woff');
-}
-}
-
-/* CLIENT-SPECIFIC STYLES */
-body,
-table,
-td,
-a {
--webkit-text-size-adjust: 100%;
--ms-text-size-adjust: 100%;
-}
-
-table,
-td {
-mso-table-lspace: 0pt;
-mso-table-rspace: 0pt;
-}
-td{
-
-}
-
-img {
--ms-interpolation-mode: bicubic;
-}
-
-/* RESET STYLES */
-img {
-border: 0;
-height: auto;
-line-height: 100%;
-outline: none;
-text-decoration: none;
-}
-
-table {
-border-collapse: collapse !important;
-}
-
-body {
-height: 100% !important;
-margin: 0 !important;
-padding: 0 !important;
-width: 100% !important;
-background-color: black;
-}
-
-/* iOS BLUE LINKS */
-a[x-apple-data-detectors] {
-color: inherit !important;
-text-decoration: none !important;
-font-size: inherit !important;
-font-family: inherit !important;
-font-weight: inherit !important;
-line-height: inherit !important;
-}
-
-/* MOBILE STYLES */
-@media screen and (max-width:600px) {
-h1 {
-font-size: 32px !important;
-line-height: 32px !important;
-}
-}
-
-/* ANDROID CENTER FIX */
-div[style*=3D"margin: 16px 0;"] {
-margin: 0 !important;
-}
-</style>
-</head>
-
-<body>
-<div>
-Hi,<br /><br />We are providing you platform from here you can sell=
-paid posts on your website.
-
-<div style=3D'width:100%'><p>Chatwoot | CS team | <a href=3D"https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg">C</hatwoota></p>
-<p>Skype: live:.cid.something</p>
-</d=
-iv>
-</div>
-<img width=3D"1px" height=3D"1px" alt=3D"" src=3D"https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg"></=
-body>
-
-</html>
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
index da2e1df9f..c0cb4a5b9 100644
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ b/spec/mailboxes/support_mailbox_spec.rb
@@ -157,29 +157,6 @@ RSpec.describe SupportMailbox, type: :mailbox do
       end
     end
 
-    describe 'when mail part is not present' do
-      let(:support_mail) { create_inbound_email_from_fixture('support_1.eml') }
-      let(:described_subject) { described_class.receive support_mail }
-
-      it 'Considers raw html mail body' do
-        described_subject
-        expect(conversation.inbox.id).to eq(channel_email.inbox.id)
-        expect(conversation.messages.last.content).to include(
-          <<-BODY.strip_heredoc.chomp
-            Hi,
-            We are providing you platform from here you can sellpaid posts on your website.
-
-            Chatwoot | CS team | [C](https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg)
-
-            Skype: live:.cid.something
-
-            []
-          BODY
-        )
-        expect(conversation.messages.last.content_attributes['email']['subject']).to eq('Get Paid to post an article')
-      end
-    end
-
     describe 'Sender with reply_to email address' do
       let(:reply_to_mail) { create_inbound_email_from_fixture('reply_to.eml') }
       let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }

From 5ad7e930591037b08ed1c86e1425a3481538890b Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 15 Feb 2022 18:15:45 +0530
Subject: [PATCH 098/101] chore: Discard activities from email notifiable
 messages (#3989)

---
 app/models/message.rb       | 3 ++-
 spec/models/message_spec.rb | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index 8e2e81307..c9113dcf0 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -137,7 +137,8 @@ class Message < ApplicationRecord
   end
 
   def email_notifiable_message?
-    return false if private? || incoming?
+    return false if private?
+    return false if %w[outgoing template].exclude?(message_type)
     return false if template? && %w[input_csat text].exclude?(content_type)
 
     true
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 1176b17e2..fea6cd5b5 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -111,6 +111,7 @@ RSpec.describe Message, type: :model do
 
     it 'return false if private message' do
       message.private = true
+      message.message_type = 'outgoing'
       expect(message.email_notifiable_message?).to be false
     end
 
@@ -120,6 +121,12 @@ RSpec.describe Message, type: :model do
       expect(message.email_notifiable_message?).to be false
     end
 
+    it 'return false if activity message' do
+      message.private = false
+      message.message_type = 'activity'
+      expect(message.email_notifiable_message?).to be false
+    end
+
     it 'return false if message type is template and content type is not input_csat or text' do
       message.private = false
       message.message_type = 'template'

From e345a4486dea849956e5266aa438c32700092180 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 15 Feb 2022 22:49:53 +0530
Subject: [PATCH 099/101] fix: Throwing NavigationDuplicated error (#3978)

---
 .../components/widgets/conversation/ConversationCard.vue       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index dc8cae554..7e6c89bac 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -255,6 +255,9 @@ export default {
         foldersId: this.foldersId,
         conversationType: this.conversationType,
       });
+      if (this.isActiveChat) {
+        return;
+      }
       router.push({ path: frontendURL(path) });
     },
   },

From 5ad6db07b4cf21a705e8b9c84f44930228fd33f4 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Tue, 15 Feb 2022 23:36:29 +0530
Subject: [PATCH 100/101] fix: Automation Bugs and minor enhancements (#3936)

---
 .../layout/config/sidebarItems/settings.js    | 14 ++---
 .../sidebarComponents/SecondaryNavItem.vue    | 20 +++++++
 .../dashboard/i18n/locale/en/automation.json  | 10 +++-
 .../settings/automation/AddAutomationRule.vue | 26 +++++++---
 .../automation/EditAutomationRule.vue         | 51 ++++++++++++------
 .../dashboard/settings/automation/Index.vue   |  4 +-
 .../settings/automation/constants.js          | 42 +++++++--------
 .../dashboard/store/modules/automations.js    |  2 +-
 .../modules/specs/automations/actions.spec.js |  4 +-
 .../modules/specs/automations/fixtures.js     | 52 +++++--------------
 .../specs/automations/mutations.spec.js       | 38 +++-----------
 app/listeners/automation_rule_listener.rb     | 10 ++++
 app/models/conversation.rb                    |  5 ++
 .../conditions_filter_service.rb              |  4 +-
 .../partials/_automation_rule.json.jbuilder   |  2 +-
 lib/events/types.rb                           |  1 +
 .../automation_rule_listener_spec.rb          | 47 +++++++++++++++++
 17 files changed, 203 insertions(+), 129 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 577d41c6b..176fd152c 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -69,13 +69,13 @@ const settings = accountId => ({
       ),
       toStateName: 'attributes_list',
     },
-    // {
-    //   icon: 'automation',
-    //   label: 'AUTOMATION',
-    //   hasSubMenu: false,
-    //   toState: frontendURL(`accounts/${accountId}/settings/automation/list`),
-    //   toStateName: 'automation_list',
-    // },
+    {
+      icon: 'automation',
+      label: 'AUTOMATION',
+      hasSubMenu: false,
+      toState: frontendURL(`accounts/${accountId}/settings/automation/list`),
+      toStateName: 'automation_list',
+    },
     {
       icon: 'chat-multiple',
       label: 'CANNED_RESPONSES',
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
index bc4cd3091..3a344d985 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
@@ -15,6 +15,13 @@
         size="14"
       />
       {{ $t(`SIDEBAR.${menuItem.label}`) }}
+      <span
+        v-if="menuItem.label === 'AUTOMATION'"
+        data-view-component="true"
+        label="Beta"
+        class="beta"
+        >Beta
+      </span>
     </router-link>
 
     <ul v-if="hasSubMenu" class="nested vertical menu">
@@ -221,4 +228,17 @@ export default {
     color: var(--w-500);
   }
 }
+.beta {
+  padding-right: var(--space-smaller) !important;
+  padding-left: var(--space-smaller) !important;
+  margin-left: var(--space-half) !important;
+  display: inline-block;
+  font-size: var(--font-size-mini);
+  font-weight: var(--font-weight-medium);
+  line-height: 18px;
+  border: 1px solid transparent;
+  border-radius: 2em;
+  color: var(--g-800);
+  border-color: var(--g-700);
+}
 </style>
diff --git a/app/javascript/dashboard/i18n/locale/en/automation.json b/app/javascript/dashboard/i18n/locale/en/automation.json
index ee78de7c8..ce95b861c 100644
--- a/app/javascript/dashboard/i18n/locale/en/automation.json
+++ b/app/javascript/dashboard/i18n/locale/en/automation.json
@@ -1,6 +1,6 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automation",
+    "HEADER": "Automations",
     "HEADER_BTN_TXT": "Add Automation Rule",
     "LOADING": "Fetching automation rules",
     "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
@@ -64,7 +64,7 @@
     },
     "EDIT": {
       "TITLE": "Edit Automation Rule",
-      "SUBMIT": "Edit",
+      "SUBMIT": "Update",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "API": {
         "SUCCESS_MESSAGE": "Automation rule updated successfully",
@@ -84,6 +84,12 @@
       "DELETE": "Delete",
       "CANCEL": "Cancel",
       "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+    },
+    "CONDITION": {
+      "DELETE_MESSAGE": "You need to have atleast one condition to save"
+    },
+    "ACTION": {
+      "DELETE_MESSAGE": "You need to have atleast one action to save"
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
index 3f9d2d83e..814e90c25 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -351,7 +351,7 @@ export default {
     getActionDropdownValues(type) {
       switch (type) {
         case 'assign_team':
-        case 'send_message':
+        case 'send_email_to_team':
           return this.$store.getters['teams/getTeams'];
         case 'add_label':
           return this.$store.getters['labels/getLabels'].map(i => {
@@ -365,12 +365,24 @@ export default {
       }
     },
     appendNewCondition() {
-      this.automation.conditions.push({
-        attribute_key: 'status',
-        filter_operator: 'equal_to',
-        values: '',
-        query_operator: 'and',
-      });
+      switch (this.automation.event_name) {
+        case 'message_created':
+          this.automation.conditions.push({
+            attribute_key: 'message_type',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          });
+          break;
+        default:
+          this.automation.conditions.push({
+            attribute_key: 'status',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          });
+          break;
+      }
     },
     appendNewAction() {
       this.automation.actions.push({
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index 223c9577f..fd8d0a492 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -121,10 +121,10 @@
               variant="clear"
               @click.prevent="onClose"
             >
-              {{ $t('AUTOMATION.ADD.CANCEL_BUTTON_TEXT') }}
+              {{ $t('AUTOMATION.EDIT.CANCEL_BUTTON_TEXT') }}
             </woot-button>
             <woot-button @click="submitAutomation">
-              {{ $t('AUTOMATION.ADD.SUBMIT') }}
+              {{ $t('AUTOMATION.EDIT.SUBMIT') }}
             </woot-button>
           </div>
         </div>
@@ -351,9 +351,9 @@ export default {
     getActionDropdownValues(type) {
       switch (type) {
         case 'assign_team':
-        case 'send_message':
-          return this.$store.getters['teams/getTeams'];
-        case 'add_label':
+        case 'send_email_to_team':
+        return this.$store.getters['teams/getTeams'];
+         case 'add_label':
           return this.$store.getters['labels/getLabels'].map(i => {
             return {
               id: i.title,
@@ -365,12 +365,32 @@ export default {
       }
     },
     appendNewCondition() {
-      this.automation.conditions.push({
-        attribute_key: 'status',
-        filter_operator: 'equal_to',
-        values: '',
-        query_operator: 'and',
-      });
+      if (
+        !this.automation.conditions[this.automation.conditions.length - 1]
+          .query_operator
+      ) {
+        this.automation.conditions[
+          this.automation.conditions.length - 1
+        ].query_operator = 'and';
+      }
+      switch (this.automation.event_name) {
+        case 'message_created':
+          this.automation.conditions.push({
+            attribute_key: 'message_type',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          });
+          break;
+        default:
+          this.automation.conditions.push({
+            attribute_key: 'status',
+            filter_operator: 'equal_to',
+            values: '',
+            query_operator: 'and',
+          });
+          break;
+      }
     },
     appendNewAction() {
       this.automation.actions.push({
@@ -380,14 +400,14 @@ export default {
     },
     removeFilter(index) {
       if (this.automation.conditions.length <= 1) {
-        this.showAlert(this.$t('FILTER.FILTER_DELETE_ERROR'));
+        this.showAlert(this.$t('AUTOMATION.CONDITION.DELETE_MESSAGE'));
       } else {
         this.automation.conditions.splice(index, 1);
       }
     },
     removeAction(index) {
       if (this.automation.actions.length <= 1) {
-        this.showAlert(this.$t('FILTER.FILTER_DELETE_ERROR'));
+        this.showAlert(this.$t('AUTOMATION.ACTION.DELETE_MESSAGE'));
       } else {
         this.automation.actions.splice(index, 1);
       }
@@ -421,8 +441,9 @@ export default {
       const formattedConditions = automation.conditions.map(condition => {
         const inputType = this.automationTypes[
           automation.event_name
-        ].conditions.find(item => item.key === condition.attribute_key)
-          .inputType;
+        ].conditions.find(
+          item => item.key === condition.attribute_key
+        ).inputType;
         if (inputType === 'plain_text') {
           return {
             ...condition,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 39fe9c71f..be79dd4f5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -219,7 +219,7 @@ export default {
         const action =
           mode === 'EDIT' ? 'automations/update' : 'automations/create';
         const successMessage =
-          mode === 'edit'
+          mode === 'EDIT'
             ? this.$t('AUTOMATION.EDIT.API.SUCCESS_MESSAGE')
             : this.$t('AUTOMATION.ADD.API.SUCCESS_MESSAGE');
 
@@ -229,7 +229,7 @@ export default {
         this.hideEditPopup();
       } catch (error) {
         const errorMessage =
-          mode === 'edit'
+          mode === 'EDIT'
             ? this.$t('AUTOMATION.EDIT.API.ERROR_MESSAGE')
             : this.$t('AUTOMATION.ADD.API.ERROR_MESSAGE');
         this.showAlert(errorMessage);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index 62e4bb998..b3b506f01 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -58,8 +58,8 @@ export const AUTOMATIONS = {
         filterOperators: OPERATOR_TYPES_1,
       },
       {
-        key: 'message_contains',
-        name: 'Message Contains',
+        key: 'content',
+        name: 'Message Content',
         attributeI18nKey: 'MESSAGE_CONTAINS',
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_2,
@@ -76,11 +76,11 @@ export const AUTOMATIONS = {
         name: 'Add a label',
         attributeI18nKey: 'ADD_LABEL',
       },
-      {
-        key: 'send_message',
-        name: 'Send an email to team',
-        attributeI18nKey: 'SEND_MESSAGE',
-      },
+      // {
+      //   key: 'send_email_to_team',
+      //   name: 'Send an email to team',
+      //   attributeI18nKey: 'SEND_MESSAGE',
+      // },
     ],
   },
   conversation_created: {
@@ -120,11 +120,11 @@ export const AUTOMATIONS = {
         name: 'Assign a team',
         attributeI18nKey: 'ASSIGN_TEAM',
       },
-      {
-        key: 'send_message',
-        name: 'Send an email to team',
-        attributeI18nKey: 'SEND_MESSAGE',
-      },
+      // {
+      //   key: 'send_email_to_team',
+      //   name: 'Send an email to team',
+      //   attributeI18nKey: 'SEND_MESSAGE',
+      // },
       {
         key: 'assign_agent',
         name: 'Assign an agent',
@@ -183,11 +183,11 @@ export const AUTOMATIONS = {
         name: 'Assign a team',
         attributeI18nKey: 'ASSIGN_TEAM',
       },
-      {
-        key: 'send_message',
-        name: 'Send an email to team',
-        attributeI18nKey: 'SEND_MESSAGE',
-      },
+      // {
+      //   key: 'send_email_to_team',
+      //   name: 'Send an email to team',
+      //   attributeI18nKey: 'SEND_MESSAGE',
+      // },
       {
         key: 'assign_agent',
         name: 'Assign an agent',
@@ -222,8 +222,8 @@ export const AUTOMATION_ACTION_TYPES = [
     key: 'add_label',
     label: 'Add a label',
   },
-  {
-    key: 'send_message',
-    label: 'Send an email to team',
-  },
+  // {
+  //   key: 'send_email_to_team',
+  //   label: 'Send an email to team',
+  // },
 ];
diff --git a/app/javascript/dashboard/store/modules/automations.js b/app/javascript/dashboard/store/modules/automations.js
index bd59f2484..a588d9ae7 100644
--- a/app/javascript/dashboard/store/modules/automations.js
+++ b/app/javascript/dashboard/store/modules/automations.js
@@ -48,7 +48,7 @@ export const actions = {
     commit(types.SET_AUTOMATION_UI_FLAG, { isUpdating: true });
     try {
       const response = await AutomationAPI.update(id, updateObj);
-      commit(types.EDIT_AUTOMATION, response.data);
+      commit(types.EDIT_AUTOMATION, response.data.payload);
     } catch (error) {
       throw new Error(error);
     } finally {
diff --git a/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
index 9ac38a5bc..035681ce7 100644
--- a/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/automations/actions.spec.js
@@ -50,7 +50,9 @@ describe('#actions', () => {
 
   describe('#update', () => {
     it('sends correct actions if API is success', async () => {
-      axios.patch.mockResolvedValue({ data: automationsList[0] });
+      axios.patch.mockResolvedValue({
+        data: { payload: automationsList[0] },
+      });
       await actions.update({ commit }, automationsList[0]);
       expect(commit.mock.calls).toEqual([
         [types.default.SET_AUTOMATION_UI_FLAG, { isUpdating: true }],
diff --git a/app/javascript/dashboard/store/modules/specs/automations/fixtures.js b/app/javascript/dashboard/store/modules/specs/automations/fixtures.js
index 65b55aa73..5e5b7943e 100644
--- a/app/javascript/dashboard/store/modules/specs/automations/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/automations/fixtures.js
@@ -1,64 +1,36 @@
 export default [
   {
-    id: 12,
+    name: 'Test 5',
+    description: 'Hello',
+    id: 46,
     account_id: 1,
-    name: 'Test',
-    description: 'This is a test',
     event_name: 'conversation_created',
     conditions: [
       {
         values: ['open'],
         attribute_key: 'status',
-        query_operator: null,
         filter_operator: 'equal_to',
       },
     ],
-    actions: [
-      {
-        action_name: 'add_label',
-        action_params: [{}],
-      },
-    ],
-    created_on: '2022-01-14T09:17:55.689Z',
+    actions: [{ action_name: 'add_label', action_params: ['testlabel'] }],
+    created_on: '2022-02-08T10:46:32.387Z',
     active: true,
   },
   {
-    id: 13,
+    id: 47,
     account_id: 1,
-    name: 'Auto resolve conversation',
-    description: 'Auto resolves conversation',
-    event_name: 'conversation_updated',
+    name: 'Snooze',
+    description: 'Test Description',
+    event_name: 'conversation_created',
     conditions: [
       {
-        values: ['resolved'],
+        values: ['pending'],
         attribute_key: 'status',
-        query_operator: null,
         filter_operator: 'equal_to',
       },
     ],
-    actions: [
-      {
-        action_name: 'add_label',
-        action_params: [{}],
-      },
-    ],
-    created_on: '2022-01-14T13:06:31.843Z',
-    active: true,
-  },
-  {
-    id: 14,
-    account_id: 1,
-    name: 'Fayaz',
-    description: 'This is a test',
-    event_name: 'conversation_created',
-    conditions: {},
-    actions: [
-      {
-        action_name: 'add_label',
-        action_params: [{}],
-      },
-    ],
-    created_on: '2022-01-17T06:46:08.098Z',
+    actions: [{ action_name: 'assign_team', action_params: [1] }],
+    created_on: '2022-02-08T11:19:44.714Z',
     active: true,
   },
 ];
diff --git a/app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js
index bdb127d0c..1eaea6380 100644
--- a/app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/automations/mutations.spec.js
@@ -18,40 +18,18 @@ describe('#mutations', () => {
     });
   });
 
-  // describe('#EDIT_AUTOMATION', () => {
-  //   it('update automation record', () => {
-  //     const state = { records: [automations[0]] };
-  //     mutations[types.EDIT_AUTOMATION](state, {
-  //       id: 12,
-  //       account_id: 1,
-  //       name: 'Test Automation',
-  //       description: 'This is a test',
-  //       event_name: 'conversation_created',
-  //       conditions: [
-  //         {
-  //           values: ['open'],
-  //           attribute_key: 'status',
-  //           query_operator: null,
-  //           filter_operator: 'equal_to',
-  //         },
-  //       ],
-  //       actions: [
-  //         {
-  //           action_name: 'add_label',
-  //           action_params: [{}],
-  //         },
-  //       ],
-  //       created_on: '2022-01-14T09:17:55.689Z',
-  //       active: true,
-  //     });
-  //     expect(state.records[0].name).toEqual('Test Automation');
-  //   });
-  // });
+  describe('#EDIT_AUTOMATION', () => {
+    it('update automation record', () => {
+      const state = { records: [automations[0]] };
+      mutations[types.EDIT_AUTOMATION](state, automations[0]);
+      expect(state.records[0].name).toEqual('Test 5');
+    });
+  });
 
   describe('#DELETE_AUTOMATION', () => {
     it('delete automation record', () => {
       const state = { records: [automations[0]] };
-      mutations[types.DELETE_AUTOMATION](state, 12);
+      mutations[types.DELETE_AUTOMATION](state, 46);
       expect(state.records).toEqual([]);
     });
   });
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 5b4893763..57e5f6da6 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -1,4 +1,14 @@
 class AutomationRuleListener < BaseListener
+  def conversation_updated(event_obj)
+    conversation = event_obj.data[:conversation]
+    return unless rule_present?('conversation_updated', conversation)
+
+    @rules.each do |rule|
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation).perform
+      AutomationRules::ActionService.new(rule, conversation).perform if conditions_match.present?
+    end
+  end
+
   def conversation_status_changed(event_obj)
     conversation = event_obj.data[:conversation]
     return unless rule_present?('conversation_status_changed', conversation)
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 70f1aae24..120d1cd3a 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -162,6 +162,7 @@ class Conversation < ApplicationRecord
   def execute_after_update_commit_callbacks
     notify_status_change
     create_activity
+    notify_conversation_updation
   end
 
   def ensure_snooze_until_reset
@@ -181,6 +182,10 @@ class Conversation < ApplicationRecord
     dispatcher_dispatch(CONVERSATION_CREATED)
   end
 
+  def notify_conversation_updation
+    dispatcher_dispatch(CONVERSATION_UPDATED)
+  end
+
   def self_assign?(assignee_id)
     assignee_id.present? && Current.user&.id == assignee_id
   end
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index 6e3d7f64f..2b1fa9e0e 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -21,14 +21,14 @@ class AutomationRules::ConditionsFilterService < FilterService
     records.any?
   end
 
-  def message_conditions(_message)
+  def message_conditions(message)
     message_filters = @filters['messages']
 
     @rule.conditions.each_with_index do |query_hash, current_index|
       current_filter = message_filters[query_hash['attribute_key']]
       @query_string += message_query_string(current_filter, query_hash.with_indifferent_access, current_index)
     end
-    records = Message.where(conversation: @conversation).where(@query_string, @filter_values.with_indifferent_access)
+    records = Message.where(id: message.id).where(@query_string, @filter_values.with_indifferent_access)
     records.any?
   end
 
diff --git a/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder b/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
index e8e596659..b0e01c824 100644
--- a/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
+++ b/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
@@ -5,5 +5,5 @@ json.description automation_rule.description
 json.event_name automation_rule.event_name
 json.conditions automation_rule.conditions
 json.actions automation_rule.actions
-json.created_on automation_rule.created_at
+json.created_on automation_rule.created_at.to_i
 json.active automation_rule.active?
diff --git a/lib/events/types.rb b/lib/events/types.rb
index d6837d10f..ec6d1d353 100644
--- a/lib/events/types.rb
+++ b/lib/events/types.rb
@@ -14,6 +14,7 @@ module Events::Types
 
   # conversation events
   CONVERSATION_CREATED = 'conversation.created'
+  CONVERSATION_UPDATED = 'conversation.updated'
   CONVERSATION_READ = 'conversation.read'
   # FIXME: deprecate the opened and resolved events in future in favor of status changed event.
   CONVERSATION_OPENED = 'conversation.opened'
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 8a5e2f8d3..8e6a9bc32 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -70,6 +70,53 @@ describe AutomationRuleListener do
     end
   end
 
+  describe '#conversation_updated' do
+    before do
+      automation_rule.update!(
+        event_name: 'conversation_updated',
+        name: 'Call actions conversation updated',
+        description: 'Add labels, assign team after conversation updated'
+      )
+    end
+
+    let!(:event) do
+      Events::Base.new('conversation_updated', Time.zone.now, { conversation: conversation })
+    end
+
+    context 'when rule matches' do
+      it 'triggers automation rule to assign team' do
+        expect(conversation.team_id).not_to eq(team.id)
+
+        automation_rule
+        listener.conversation_updated(event)
+
+        conversation.reload
+        expect(conversation.team_id).to eq(team.id)
+      end
+
+      it 'triggers automation rule to add label' do
+        expect(conversation.labels).to eq([])
+
+        automation_rule
+        listener.conversation_updated(event)
+
+        conversation.reload
+        expect(conversation.labels.pluck(:name)).to eq(%w[support priority_customer])
+      end
+
+      it 'triggers automation rule to assign best agents' do
+        expect(conversation.assignee).to be_nil
+
+        automation_rule
+        listener.conversation_updated(event)
+
+        conversation.reload
+
+        expect(conversation.assignee).to eq(user_1)
+      end
+    end
+  end
+
   describe '#message_created' do
     before do
       automation_rule.update!(

From 991f291c69992a690fe5b8e3cdc67547304885d1 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Tue, 15 Feb 2022 23:39:57 +0530
Subject: [PATCH 101/101] Bump version to 2.2.0

---
 config/app.yml | 2 +-
 package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/app.yml b/config/app.yml
index 91cbf9784..32c707807 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.1.1'
+  version: '2.2.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 70dae965f..2c36a7284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue} --fix",