From 59964a4f417abff5377fb33df40825ca4e466781 Mon Sep 17 00:00:00 2001
From: "Giau. Tran Minh" <giau.tmg@gmail.com>
Date: Thu, 16 Feb 2023 14:17:26 +0200
Subject: [PATCH 01/94] swagger: fixed invalid specification (#5485)

Currently, the swagger spec doesn't follow the Swagger 2.0 specification. So, I facing 4 errors when trying generate the Golang client for chatwoot.
Due to the spec, the binary field should use format: binary beside type: string

Signed-off-by: Giau. Tran Minh <hello@giautm.dev>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .circleci/config.yml                          |  4 +--
 swagger/definitions/index.yml                 |  7 -----
 .../definitions/request/contact/create.yml    |  3 +-
 .../definitions/request/contact/update.yml    |  3 +-
 .../resource/extension/conversation/show.yml  |  1 -
 .../extension/message/with_source_sender.yml  |  2 --
 swagger/swagger.json                          | 30 +++----------------
 7 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e6394ccde..69ceb2772 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,8 +102,8 @@ jobs:
               echo "ERROR: The swagger.json file is not in sync with the yaml specification. Run 'rake swagger:build' and commit 'swagger/swagger.json'."
               exit 1
             fi
-            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.3.0/openapi-generator-cli-5.3.0.jar > ~/tmp/openapi-generator-cli-5.3.0.jar
-            java -jar ~/tmp/openapi-generator-cli-5.3.0.jar validate -i swagger/swagger.json
+            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar > ~/tmp/openapi-generator-cli-6.3.0.jar
+            java -jar ~/tmp/openapi-generator-cli-6.3.0.jar validate -i swagger/swagger.json
             
       # Database setup
       - run: yarn install --check-files
diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index ee452ceb6..3f70db3f9 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -158,13 +158,6 @@ conversation_status_toggle:
 conversation_labels:
   $ref: ./resource/extension/conversation/labels.yml
 
-## message
-extended_message:
-  allOf:
-    - $ref: '#/definitions/generic_id'
-    - $ref: '#/definitions/message'
-    - $ref: ./resource/extension/message/with_source_sender.yml
-
 
 ## report
 account_summary:
diff --git a/swagger/definitions/request/contact/create.yml b/swagger/definitions/request/contact/create.yml
index 62e967fd6..5acbe5f94 100644
--- a/swagger/definitions/request/contact/create.yml
+++ b/swagger/definitions/request/contact/create.yml
@@ -14,7 +14,8 @@ properties:
     type: string
     description: phone number of the contact
   avatar:
-    type: string <binary>
+    type: string
+    format: binary
     description: Send the form data with the avatar image binary or use the avatar_url
   avatar_url:
     type: string
diff --git a/swagger/definitions/request/contact/update.yml b/swagger/definitions/request/contact/update.yml
index c6a94308f..4a12672a3 100644
--- a/swagger/definitions/request/contact/update.yml
+++ b/swagger/definitions/request/contact/update.yml
@@ -10,7 +10,8 @@ properties:
     type: string
     description: phone number of the contact
   avatar:
-    type: string <binary>
+    type: string
+    format: binary
     description: Send the form data with the avatar image binary or use the avatar_url
   avatar_url:
     type: string
diff --git a/swagger/definitions/resource/extension/conversation/show.yml b/swagger/definitions/resource/extension/conversation/show.yml
index 8f44436e9..fb697ad38 100644
--- a/swagger/definitions/resource/extension/conversation/show.yml
+++ b/swagger/definitions/resource/extension/conversation/show.yml
@@ -1,5 +1,4 @@
 type: object
 allOf:
-  - $ref: '#/definitions/generic_id'
   - $ref: '#/definitions/conversation'
   - $ref: '../contact/conversation.yml'
diff --git a/swagger/definitions/resource/extension/message/with_source_sender.yml b/swagger/definitions/resource/extension/message/with_source_sender.yml
index 14110c348..b52063c2d 100644
--- a/swagger/definitions/resource/extension/message/with_source_sender.yml
+++ b/swagger/definitions/resource/extension/message/with_source_sender.yml
@@ -2,5 +2,3 @@ type: object
 properties:
   source_id:
     type: number
-  sender:
-    type: object
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 5878d1e41..a49aa4f96 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -5688,7 +5688,8 @@
           "description": "phone number of the contact"
         },
         "avatar": {
-          "type": "string <binary>",
+          "type": "string",
+          "format": "binary",
           "description": "Send the form data with the avatar image binary or use the avatar_url"
         },
         "avatar_url": {
@@ -5721,7 +5722,8 @@
           "description": "phone number of the contact"
         },
         "avatar": {
-          "type": "string <binary>",
+          "type": "string",
+          "format": "binary",
           "description": "Send the form data with the avatar image binary or use the avatar_url"
         },
         "avatar_url": {
@@ -6157,9 +6159,6 @@
     "conversation_show": {
       "type": "object",
       "allOf": [
-        {
-          "$ref": "#/definitions/generic_id"
-        },
         {
           "$ref": "#/definitions/conversation"
         },
@@ -6237,27 +6236,6 @@
         }
       }
     },
-    "extended_message": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/generic_id"
-        },
-        {
-          "$ref": "#/definitions/message"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "source_id": {
-              "type": "number"
-            },
-            "sender": {
-              "type": "object"
-            }
-          }
-        }
-      ]
-    },
     "account_summary": {
       "type": "object",
       "properties": {

From 71d8195845305e0717d020c92065f6b8b0b9f8f3 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 16 Feb 2023 09:57:11 -0800
Subject: [PATCH 02/94] fix: Add scoped CSS for participants (#6472)

---
 .../routes/dashboard/conversation/ConversationParticipant.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
index 229f1b03a..6088acf1a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
@@ -224,7 +224,7 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .watchers-wrap {
   position: relative;
 }

From 4d719a8fe33bed72ec57812e174dab1874315340 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 17 Feb 2023 17:48:16 +0530
Subject: [PATCH 03/94] fix: Add a settings link for portals in sidebar (#6475)

---
 app/javascript/dashboard/i18n/locale/en/settings.json    | 1 +
 .../dashboard/helpcenter/components/HelpCenterLayout.vue | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 9fff8d68b..a37884db8 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -238,6 +238,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
index a94078561..e99f3aac3 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
@@ -185,6 +185,15 @@ export default {
           toolTip: 'Archived',
           toStateName: 'list_archived_articles',
         },
+        {
+          icon: 'settings',
+          label: 'HELP_CENTER.SETTINGS',
+          key: 'edit_portal_information',
+          toState: frontendURL(
+            `accounts/${this.accountId}/portals/${this.selectedPortalSlug}/edit`
+          ),
+          toStateName: 'edit_portal_information',
+        },
       ];
     },
     additionalSecondaryMenuItems() {

From b479b7c6d7a34ddfa2e60b601e358c39b4fffb16 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 17 Feb 2023 08:43:28 -0800
Subject: [PATCH 04/94] chore: Enable push permissions if available (#6474)

---
 .../dashboard/settings/profile/NotificationSettings.vue  | 9 +++------
 app/views/layouts/vueapp.html.erb                        | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
index 2c3650c29..a13c4d704 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
@@ -235,7 +235,7 @@
       </div>
     </div>
     <div
-      v-if="vapidPublicKey && !isBrowserSafari"
+      v-if="vapidPublicKey && hasPushAPISupport"
       class="profile--settings--row row push-row"
     >
       <div class="columns small-3 ">
@@ -393,11 +393,8 @@ export default {
       pushFlags: 'userNotificationSettings/getSelectedPushFlags',
       uiSettings: 'getUISettings',
     }),
-    isBrowserSafari() {
-      if (window.browserConfig) {
-        return window.browserConfig.is_safari === 'true';
-      }
-      return false;
+    hasPushAPISupport() {
+      return !!('Notification' in window);
     },
   },
   watch: {
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 206598032..4c0c62a49 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -49,7 +49,6 @@
       window.globalConfig = <%= raw @global_config.to_json %>
       window.browserConfig = {
         browser_name: '<%= browser.name %>',
-        is_safari: '<%= browser.safari? %>'
       }
       window.errorLoggingConfig = '<%= ENV.fetch('SENTRY_DSN', '')%>'
     </script>

From c9242fac9e55169cff8b3051c7b12dbc9787832a Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:14:16 +0530
Subject: [PATCH 05/94] fix: Warning in conversations page from participants
 (#6479)

---
 .../routes/dashboard/conversation/ConversationParticipant.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
index 6088acf1a..1e348b746 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
@@ -164,7 +164,7 @@ export default {
     conversationId() {
       this.fetchParticipants();
     },
-    watchersFromStore(participants) {
+    watchersFromStore(participants = []) {
       this.selectedWatchers = [...participants];
     },
   },

From 26f164d6a08a1c84d150cb1a9b7f33ef8fc19bbb Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Mon, 20 Feb 2023 23:37:41 +0530
Subject: [PATCH 06/94] fix: foss_spec github action (#6495)

* fix: foss_spec gh action
* chore: upload log artifact in foss_spec gh action
* chore: ping foss_spec gh action runner os version to ubuntu-20.04
* fix: set nodeversion to 16
---
 .github/workflows/run_foss_spec.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml
index 98fae5c8e..51688944c 100644
--- a/.github/workflows/run_foss_spec.yml
+++ b/.github/workflows/run_foss_spec.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     services:
       postgres:
         image: postgres:10.8
@@ -49,6 +49,10 @@ jobs:
       with:
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+
     - name: yarn
       run: yarn install
 
@@ -70,3 +74,10 @@ jobs:
     - name: Run backend tests
       run: |
         bundle exec rspec --profile=10 --format documentation
+
+    - name: Upload rails log folder
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: rails-log-folder
+        path: log

From 62de25960c81c5aa613ae592ffe785076d2294e8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 21 Feb 2023 08:42:45 +0530
Subject: [PATCH 07/94] feat: Integrate LogRocket (#6494)

* feat: install logrocket

* feat: allow log rocket

* feat: enable vuex log-rocket

* feat: integrate vuex with log rocket

* feat: add log rocket identify

* fix: identify if log rocket is initialized

---------

Co-authored-by: Vishnu Narayanan <vishnu@chatwoot.com>
---
 .env.example                                  |  3 +++
 .../dashboard/helper/scriptHelpers.js         |  7 +++++++
 app/javascript/dashboard/store/index.js       | 20 +++++++++++++++++++
 app/views/layouts/vueapp.html.erb             |  1 +
 package.json                                  |  2 ++
 yarn.lock                                     | 10 ++++++++++
 6 files changed, 43 insertions(+)

diff --git a/.env.example b/.env.example
index 149d1f6e6..39d5c06ec 100644
--- a/.env.example
+++ b/.env.example
@@ -169,6 +169,9 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## Sentry
 # SENTRY_DSN=
 
+## LogRocket
+# LOG_ROCKET_PROJECT_ID=xxxxx/some-project
+
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
diff --git a/app/javascript/dashboard/helper/scriptHelpers.js b/app/javascript/dashboard/helper/scriptHelpers.js
index 3aa0f5379..90b872363 100644
--- a/app/javascript/dashboard/helper/scriptHelpers.js
+++ b/app/javascript/dashboard/helper/scriptHelpers.js
@@ -1,4 +1,5 @@
 import AnalyticsHelper from './AnalyticsHelper';
+import LogRocket from 'logrocket';
 import DashboardAudioNotificationHelper from './AudioAlerts/DashboardAudioNotificationHelper';
 
 export const CHATWOOT_SET_USER = 'CHATWOOT_SET_USER';
@@ -10,6 +11,12 @@ export const ANALYTICS_RESET = 'ANALYTICS_RESET';
 export const initializeAnalyticsEvents = () => {
   window.bus.$on(ANALYTICS_IDENTITY, ({ user }) => {
     AnalyticsHelper.identify(user);
+    if (window.logRocketProjectId) {
+      LogRocket.identify(user.id, {
+        email: user.email,
+        name: user.name,
+      });
+    }
   });
   window.bus.$on(ANALYTICS_RESET, () => {});
 };
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 632c14d2c..e2d34f50d 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -42,6 +42,25 @@ import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
 
+import LogRocket from 'logrocket';
+import createPlugin from 'logrocket-vuex';
+
+const plugins = [];
+
+if (window.logRocketProjectId) {
+  LogRocket.init(window.logRocketProjectId);
+  const logRocketPlugin = createPlugin(LogRocket, function(mutation) {
+    const eventsToIgnore = ['SET_CURRENT_USER', 'AUTHENTICATE', 'CLEAR_USER'];
+    if (eventsToIgnore.includes(mutation.type)) {
+      return null;
+    }
+
+    return mutation;
+  });
+
+  plugins.push(logRocketPlugin);
+}
+
 Vue.use(Vuex);
 export default new Vuex.Store({
   modules: {
@@ -86,4 +105,5 @@ export default new Vuex.Store({
     userNotificationSettings,
     webhooks,
   },
+  plugins,
 });
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 4c0c62a49..eba020c8b 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -51,6 +51,7 @@
         browser_name: '<%= browser.name %>',
       }
       window.errorLoggingConfig = '<%= ENV.fetch('SENTRY_DSN', '')%>'
+      window.logRocketProjectId = '<%= ENV.fetch('LOG_ROCKET_PROJECT_ID', '')%>'
     </script>
     <% if @global_config['ANALYTICS_TOKEN'].present? %>
     <script>
diff --git a/package.json b/package.json
index a5fde6a4b..62d2c63da 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,8 @@
     "highlight.js": "~10.4.1",
     "ionicons": "~2.0.1",
     "js-cookie": "^2.2.1",
+    "logrocket": "^3.0.1",
+    "logrocket-vuex": "^0.0.3",
     "marked": "4.0.10",
     "md5": "^2.3.0",
     "ninja-keys": "^1.1.9",
diff --git a/yarn.lock b/yarn.lock
index 18ec29bc6..2f78d9446 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11210,6 +11210,16 @@ loglevel@^1.6.8:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
+logrocket-vuex@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/logrocket-vuex/-/logrocket-vuex-0.0.3.tgz#e11d65d384f0c9fdac72f984436cc038adf3db90"
+  integrity sha512-Xnl3pBEkc/bbtZ5JEtFwqNjVuLzVEohlBpyQHP47BlO+/6sFmSM2JcNWojysYUo4cp3IWpmWXcezax2+Cq4RsA==
+
+logrocket@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/logrocket/-/logrocket-3.0.1.tgz#c746e8df3d5fee999b152975e51db1908357a6f0"
+  integrity sha512-jOWG+jEzobKVxGytzZ+4KGm2kiMQMRTHab2uDWQyVZcHfEF38BlCH1yjQVY4LCmuQUwZitP9biMzJZnyUQ0dtQ==
+
 loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"

From 930863b25b3874bafea7481de1facb15ca2f6180 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Tue, 21 Feb 2023 09:34:51 +0530
Subject: [PATCH 08/94] fix: sentry CHATWOOT-37A ActiveRecord::RecordNotUnique
 (#6496)

* fix: sentry CHATWOOT-37A #6457

* chore: add spec
---------

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../api/v1/accounts/conversations_controller.rb      |  2 ++
 .../api/v1/accounts/conversations_controller_spec.rb | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index ec107dfff..10a676738 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -142,6 +142,8 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     # and deprecate the support of passing only source_id as the param
     @contact_inbox ||= ::ContactInbox.find_by!(source_id: params[:source_id])
     authorize @contact_inbox.inbox, :show?
+  rescue ActiveRecord::RecordNotUnique
+    render json: { error: 'source_id should be unique' }, status: :unprocessable_entity
   end
 
   def build_contact_inbox
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index d012d5f53..f38d9c1bf 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -207,7 +207,7 @@ RSpec.describe 'Conversations API', type: :request do
   describe 'POST /api/v1/accounts/{account.id}/conversations' do
     let(:contact) { create(:contact, account: account) }
     let(:inbox) { create(:inbox, account: account) }
-    let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+    let!(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
 
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
@@ -251,6 +251,16 @@ RSpec.describe 'Conversations API', type: :request do
           expect(response_data[:additional_attributes]).to eq(additional_attributes)
         end
 
+        it 'does not create a new conversation if source_id is not unique' do
+          new_contact = create(:contact, account: account)
+
+          post "/api/v1/accounts/#{account.id}/conversations",
+               headers: agent.create_new_auth_token,
+               params: { source_id: contact_inbox.source_id, inbox_id: inbox.id, contact_id: new_contact.id },
+               as: :json
+          expect(response).to have_http_status(:unprocessable_entity)
+        end
+
         it 'creates a conversation in specificed status' do
           allow(Rails.configuration.dispatcher).to receive(:dispatch)
           post "/api/v1/accounts/#{account.id}/conversations",

From e3d9a0441d465535a7aa0566d6e94bc521531376 Mon Sep 17 00:00:00 2001
From: Afonso Lage <lage.afonso@gmail.com>
Date: Tue, 21 Feb 2023 08:35:46 -0300
Subject: [PATCH 09/94] chore: Bumped Ruby version on codespace image to 3.1.3
 (#6490)

- Bumped Ruby version on codespace docker image to match the new Ruby version 3.1.3, which is required since from 2.14.
---
 .devcontainer/Dockerfile.base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile.base b/.devcontainer/Dockerfile.base
index 769be24f8..c0beb9eed 100644
--- a/.devcontainer/Dockerfile.base
+++ b/.devcontainer/Dockerfile.base
@@ -30,7 +30,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     npm
 
 # Install rbenv and ruby
-ARG RUBY_VERSION="3.0.4"
+ARG RUBY_VERSION="3.1.3"
 RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
     &&  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \
     &&  echo 'eval "$(rbenv init -)"' >> ~/.bashrc

From aff97bff26bd9d6ff14777fe8b04e2ed6d643fac Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Tue, 21 Feb 2023 13:20:55 +0100
Subject: [PATCH 10/94] feat: Supports masking tokens in super admin (#6491)

Supports masking/unmasking sensitive data such as API Tokens in the super admin dashboard.
ref: #6322

Co-authored-by: raph941 <45232708+raph941@users.noreply.github.com>
Co-authored-by: phunguyenmurcul <51897872+phunguyenmurcul@users.noreply.github.com>
---
 app/assets/config/manifest.js                 |  1 +
 app/assets/javascripts/secretField.js         | 34 +++++++++++++++++++
 .../administrate/components/_cells.scss       | 17 ++++++++++
 app/dashboards/access_token_dashboard.rb      |  2 +-
 app/fields/secret_field.rb                    |  4 +++
 app/views/fields/secret_field/_index.html.erb | 17 ++++++++++
 app/views/fields/secret_field/_show.html.erb  | 18 ++++++++++
 .../super_admin/application/_icons.html.erb   | 12 +++++++
 8 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/secretField.js
 create mode 100644 app/fields/secret_field.rb
 create mode 100644 app/views/fields/secret_field/_index.html.erb
 create mode 100644 app/views/fields/secret_field/_show.html.erb

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index f5e0f5476..38da59e09 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -2,3 +2,4 @@
 //= link administrate/application.css
 //= link administrate/application.js
 //= link dashboardChart.js
+//= link secretField.js
diff --git a/app/assets/javascripts/secretField.js b/app/assets/javascripts/secretField.js
new file mode 100644
index 000000000..463109812
--- /dev/null
+++ b/app/assets/javascripts/secretField.js
@@ -0,0 +1,34 @@
+// eslint-disable-next-line
+function toggleSecretField(e) {
+  e.preventDefault();
+  e.stopPropagation();
+
+  const toggler = e.currentTarget;
+  const secretField = toggler.parentElement;
+  const textElement = secretField.querySelector('[data-secret-masked]');
+
+  if (!textElement) return;
+
+  if (textElement.dataset.secretMasked === 'false') {
+    textElement.textContent = '•'.repeat(10);
+    textElement.dataset.secretMasked = 'true';
+    toggler.querySelector('svg use').setAttribute('xlink:href', '#eye-show');
+
+    return;
+  }
+
+  textElement.textContent = secretField.dataset.secretText;
+  textElement.dataset.secretMasked = 'false';
+  toggler.querySelector('svg use').setAttribute('xlink:href', '#eye-hide');
+}
+
+// eslint-disable-next-line
+function copySecretField(e) {
+  e.preventDefault();
+  e.stopPropagation();
+
+  const toggler = e.currentTarget;
+  const secretField = toggler.parentElement;
+
+  navigator.clipboard.writeText(secretField.dataset.secretText);
+}
diff --git a/app/assets/stylesheets/administrate/components/_cells.scss b/app/assets/stylesheets/administrate/components/_cells.scss
index 2f7e27c4a..b5a079976 100644
--- a/app/assets/stylesheets/administrate/components/_cells.scss
+++ b/app/assets/stylesheets/administrate/components/_cells.scss
@@ -43,3 +43,20 @@
 .cell-label--number {
   text-align: right;
 }
+
+.cell-data__secret-field {
+  align-items: center;
+  display: flex;
+
+  span {
+    flex: 1;
+  }
+
+  button {
+    margin-left: 5px;
+
+    svg {
+      fill: currentColor;
+    }
+  }
+}
diff --git a/app/dashboards/access_token_dashboard.rb b/app/dashboards/access_token_dashboard.rb
index 8d4f7840e..d3f05a799 100644
--- a/app/dashboards/access_token_dashboard.rb
+++ b/app/dashboards/access_token_dashboard.rb
@@ -10,7 +10,7 @@ class AccessTokenDashboard < Administrate::BaseDashboard
   ATTRIBUTE_TYPES = {
     owner: Field::Polymorphic,
     id: Field::Number,
-    token: Field::String,
+    token: SecretField,
     created_at: Field::DateTime,
     updated_at: Field::DateTime
   }.freeze
diff --git a/app/fields/secret_field.rb b/app/fields/secret_field.rb
new file mode 100644
index 000000000..6bc7c535a
--- /dev/null
+++ b/app/fields/secret_field.rb
@@ -0,0 +1,4 @@
+require 'administrate/field/base'
+
+class SecretField < Administrate::Field::String
+end
diff --git a/app/views/fields/secret_field/_index.html.erb b/app/views/fields/secret_field/_index.html.erb
new file mode 100644
index 000000000..d6518673f
--- /dev/null
+++ b/app/views/fields/secret_field/_index.html.erb
@@ -0,0 +1,17 @@
+<%#
+# SecretField Index Partial
+%>
+<%= javascript_include_tag "secretField" %>
+<div data-secret-text="<%= field.data %>" class="cell-data__secret-field">
+  <span data-secret-masked="true">••••••••••</span>
+  <button onclick="toggleSecretField(event)" data-secret-toggler>
+    <svg width="20" height="20">
+      <use xlink:href="#eye-show" />
+    </svg>
+  </button>
+  <button onclick="copySecretField(event)" data-secret-copier>
+    <svg width="20" height="20">
+      <use xlink:href="#icon-copy" />
+    </svg>
+  </button>
+</div>
diff --git a/app/views/fields/secret_field/_show.html.erb b/app/views/fields/secret_field/_show.html.erb
new file mode 100644
index 000000000..6b5d6059b
--- /dev/null
+++ b/app/views/fields/secret_field/_show.html.erb
@@ -0,0 +1,18 @@
+<%#
+# SecretField Show Partial
+%>
+<%= javascript_include_tag "secretField" %>
+
+<div data-secret-text="<%= field.data %>" class="cell-data__secret-field">
+  <span data-secret-masked="true">••••••••••</span>
+  <button onclick="toggleSecretField(event)" data-secret-toggler>
+    <svg width="20" height="20">
+      <use xlink:href="#eye-show" />
+    </svg>
+  </button>
+  <button onclick="copySecretField(event)" data-secret-copier>
+    <svg width="20" height="20">
+      <use xlink:href="#icon-copy" />
+    </svg>
+  </button>
+</div>
diff --git a/app/views/super_admin/application/_icons.html.erb b/app/views/super_admin/application/_icons.html.erb
index 1add01cad..d4ea86470 100644
--- a/app/views/super_admin/application/_icons.html.erb
+++ b/app/views/super_admin/application/_icons.html.erb
@@ -10,4 +10,16 @@
   <symbol id="icon-up-caret" viewBox="0 0 48 48">
     <path d="M2.988 33.02c-1.66 0-1.943-.81-.618-1.824l20-15.28c.878-.672 2.31-.67 3.188 0l20.075 15.288c1.316 1.003 1.048 1.816-.62 1.816H2.987z" />
   </symbol>
+
+  <symbol id="icon-copy" viewBox="0 0 24 24">
+    <path d="M5.503 4.627 5.5 6.75v10.504a3.25 3.25 0 0 0 3.25 3.25h8.616a2.251 2.251 0 0 1-2.122 1.5H8.75A4.75 4.75 0 0 1 4 17.254V6.75c0-.98.627-1.815 1.503-2.123ZM17.75 2A2.25 2.25 0 0 1 20 4.25v13a2.25 2.25 0 0 1-2.25 2.25h-9a2.25 2.25 0 0 1-2.25-2.25v-13A2.25 2.25 0 0 1 8.75 2h9Zm0 1.5h-9a.75.75 0 0 0-.75.75v13c0 .414.336.75.75.75h9a.75.75 0 0 0 .75-.75v-13a.75.75 0 0 0-.75-.75Z" />
+  </symbol>
+
+  <symbol id="eye-show" viewBox="0 0 24 24">
+    <path d="M12 9.005a4 4 0 1 1 0 8 4 4 0 0 1 0-8Zm0 1.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM12 5.5c4.613 0 8.596 3.15 9.701 7.564a.75.75 0 1 1-1.455.365 8.503 8.503 0 0 0-16.493.004.75.75 0 0 1-1.455-.363A10.003 10.003 0 0 1 12 5.5Z" />
+  </symbol>
+
+  <symbol id="eye-hide" viewBox="0 0 24 24">
+    <path d="M2.22 2.22a.75.75 0 0 0-.073.976l.073.084 4.034 4.035a9.986 9.986 0 0 0-3.955 5.75.75.75 0 0 0 1.455.364 8.49 8.49 0 0 1 3.58-5.034l1.81 1.81A4 4 0 0 0 14.8 15.86l5.919 5.92a.75.75 0 0 0 1.133-.977l-.073-.084-6.113-6.114.001-.002-1.2-1.198-2.87-2.87h.002L8.719 7.658l.001-.002-1.133-1.13L3.28 2.22a.75.75 0 0 0-1.06 0Zm7.984 9.045 3.535 3.536a2.5 2.5 0 0 1-3.535-3.535ZM12 5.5c-1 0-1.97.148-2.889.425l1.237 1.236a8.503 8.503 0 0 1 9.899 6.272.75.75 0 0 0 1.455-.363A10.003 10.003 0 0 0 12 5.5Zm.195 3.51 3.801 3.8a4.003 4.003 0 0 0-3.801-3.8Z" />
+  </symbol>
 </svg>

From b905d4854aaeed005223a6795601f0ab5846522c Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:49:15 +0100
Subject: [PATCH 11/94] fix: Access token should be hidden/masked by default in
 Agent Dashboard (#6492)

Supports masking/unmasking sensitive data such as API Tokens in the agent dashboard.

Fixes: #6322

Co-authored-by: raph941 <45232708+raph941@users.noreply.github.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/components/MaskedText.vue       | 63 +++++++++++++++++++
 .../dashboard/settings/profile/Index.vue      |  4 +-
 .../FluentIcon/dashboard-icons.json           |  4 +-
 3 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/dashboard/components/MaskedText.vue

diff --git a/app/javascript/dashboard/components/MaskedText.vue b/app/javascript/dashboard/components/MaskedText.vue
new file mode 100644
index 000000000..a3355ddfa
--- /dev/null
+++ b/app/javascript/dashboard/components/MaskedText.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="text--container">
+    <woot-button size="small" class=" button--text" @click="onCopy">
+      {{ $t('COMPONENTS.CODE.BUTTON_TEXT') }}
+    </woot-button>
+    <woot-button
+      variant="clear"
+      size="small"
+      class="button--visibility"
+      color-scheme="secondary"
+      :icon="masked ? 'eye-show' : 'eye-hide'"
+      @click.prevent="toggleMasked"
+    />
+    <highlightjs v-if="value" :code="masked ? '•'.repeat(10) : value" />
+  </div>
+</template>
+
+<script>
+import 'highlight.js/styles/default.css';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
+
+export default {
+  props: {
+    value: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      masked: true,
+    };
+  },
+  methods: {
+    async onCopy(e) {
+      e.preventDefault();
+      await copyTextToClipboard(this.value);
+      bus.$emit('newToastMessage', this.$t('COMPONENTS.CODE.COPY_SUCCESSFUL'));
+    },
+    toggleMasked() {
+      this.masked = !this.masked;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.text--container {
+  position: relative;
+  text-align: left;
+
+  .button--text,
+  .button--visibility {
+    margin-top: 0;
+    position: absolute;
+    right: 0;
+  }
+
+  .button--visibility {
+    right: 60px;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 23b5425e2..2c1294b6f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -112,7 +112,7 @@
         </p>
       </div>
       <div class="columns small-9 medium-5">
-        <woot-code :script="currentUser.access_token" />
+        <masked-text :value="currentUser.access_token" />
       </div>
     </div>
   </div>
@@ -130,6 +130,7 @@ import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 import uiSettingsMixin, {
   isEditorHotKeyEnabled,
 } from 'dashboard/mixins/uiSettings';
+import MaskedText from 'dashboard/components/MaskedText.vue';
 import PreviewCard from 'dashboard/components/ui/PreviewCard.vue';
 
 export default {
@@ -138,6 +139,7 @@ export default {
     ChangePassword,
     MessageSignature,
     PreviewCard,
+    MaskedText,
   },
   mixins: [alertMixin, globalConfigMixin, uiSettingsMixin],
   data() {
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 4faab60a3..a6df3b713 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -173,5 +173,7 @@
     "M8.78 1.22a.75.75 0 0 0-1.06 1.06l.72.72H6.25A3.25 3.25 0 0 0 3 6.25v2.19l-.72-.72a.75.75 0 0 0-1.06 1.06l2 2a.748.748 0 0 0 1.06 0l2-2a.747.747 0 0 0 0-1.06.75.75 0 0 0-1.06 0l-.72.72V6.25c0-.966.784-1.75 1.75-1.75h2.19l-.72.72a.75.75 0 0 0 .78 1.237.75.75 0 0 0 .28-.177l2-2a.75.75 0 0 0 0-1.06l-2-2Z",
     "M11.832 3a1.755 1.755 0 0 1 0 1.5H14v4h-4V6.475l-.513.512a1.742 1.742 0 0 1-.987.495V8.5H7.482c-.052.361-.217.71-.495.987L6.475 10H8.5v4h-4v-2.168a1.755 1.755 0 0 1-1.5 0v5.918A3.25 3.25 0 0 0 6.25 21h11.5A3.25 3.25 0 0 0 21 17.75V6.25A3.25 3.25 0 0 0 17.75 3h-5.918ZM10 14v-4h4v4h-4Zm5.5 0v-4h4v4h-4ZM14 15.5v4h-4v-4h4Zm1.5 4v-4h4v2.25a1.75 1.75 0 0 1-1.75 1.75H15.5Zm0-11v-4h2.25c.966 0 1.75.784 1.75 1.75V8.5h-4Zm-11 7h4v4H6.25a1.75 1.75 0 0 1-1.75-1.75V15.5Z"
   ],
-  "translate-outline": "M16.953 5.303a1 1 0 0 0-1.906-.606c-.124.389-.236.899-.324 1.344-.565.012-1.12 0-1.652-.038a1 1 0 1 0-.142 1.995c.46.032.934.048 1.416.047a25.649 25.649 0 0 0-.24 1.698c-1.263.716-2.142 1.684-2.636 2.7-.624 1.283-.7 2.857.239 3.883.675.736 1.704.758 2.499.588.322-.068.654-.176.988-.32a1 1 0 0 0 1.746-.93 13.17 13.17 0 0 0-.041-.115 8.404 8.404 0 0 0 2.735-4.06c.286.251.507.55.658.864.284.594.334 1.271.099 1.91-.234.633-.78 1.313-1.84 1.843a1 1 0 0 0 .895 1.789c1.44-.72 2.385-1.758 2.821-2.94a4.436 4.436 0 0 0-.17-3.464 4.752 4.752 0 0 0-2.104-2.165C19.998 9.22 20 9.11 20 9a1 1 0 0 0-1.974-.23 5.984 5.984 0 0 0-1.796.138c.047-.305.102-.626.166-.964a20.142 20.142 0 0 0 2.842-.473 1 1 0 0 0-.476-1.942c-.622.152-1.286.272-1.964.358.048-.208.1-.409.155-.584Zm-3.686 8.015c.166-.34.414-.697.758-1.037.02.348.053.67.098.973.083.56.207 1.048.341 1.477a3.41 3.41 0 0 1-.674.227c-.429.092-.588.019-.614.006l-.004-.001c-.162-.193-.329-.774.095-1.645Zm4.498-2.562a6.362 6.362 0 0 1-1.568 2.73 7.763 7.763 0 0 1-.095-.525 10.294 10.294 0 0 1-.088-1.904c.033-.013.067-.024.1-.036l1.651-.265Zm0 0-1.651.265c.602-.212 1.155-.29 1.651-.265ZM7.536 6.29a6.342 6.342 0 0 0-4.456.331 1 1 0 0 0 .848 1.811 4.342 4.342 0 0 1 3.049-.222c.364.107.568.248.69.37.12.123.203.27.257.454.067.225.087.446.09.69a8.195 8.195 0 0 0-.555-.117c-1.146-.199-2.733-.215-4.262.64-1.271.713-1.796 2.168-1.682 3.448.12 1.326.94 2.679 2.572 3.136 1.48.414 2.913-.045 3.877-.507l.08-.04a1 1 0 0 0 1.96-.281V10.5c0-.053.002-.12.005-.2.012-.417.034-1.16-.168-1.838a3.043 3.043 0 0 0-.755-1.29c-.394-.398-.91-.694-1.547-.881h-.003Zm-.419 5.288c.344.06.647.143.887.222v2.197a7.021 7.021 0 0 1-.905.524c-.792.38-1.682.605-2.473.384-.698-.195-1.06-.742-1.119-1.389-.062-.693.243-1.286.667-1.523.987-.553 2.06-.569 2.943-.415Z"
+  "translate-outline": "M16.953 5.303a1 1 0 0 0-1.906-.606c-.124.389-.236.899-.324 1.344-.565.012-1.12 0-1.652-.038a1 1 0 1 0-.142 1.995c.46.032.934.048 1.416.047a25.649 25.649 0 0 0-.24 1.698c-1.263.716-2.142 1.684-2.636 2.7-.624 1.283-.7 2.857.239 3.883.675.736 1.704.758 2.499.588.322-.068.654-.176.988-.32a1 1 0 0 0 1.746-.93 13.17 13.17 0 0 0-.041-.115 8.404 8.404 0 0 0 2.735-4.06c.286.251.507.55.658.864.284.594.334 1.271.099 1.91-.234.633-.78 1.313-1.84 1.843a1 1 0 0 0 .895 1.789c1.44-.72 2.385-1.758 2.821-2.94a4.436 4.436 0 0 0-.17-3.464 4.752 4.752 0 0 0-2.104-2.165C19.998 9.22 20 9.11 20 9a1 1 0 0 0-1.974-.23 5.984 5.984 0 0 0-1.796.138c.047-.305.102-.626.166-.964a20.142 20.142 0 0 0 2.842-.473 1 1 0 0 0-.476-1.942c-.622.152-1.286.272-1.964.358.048-.208.1-.409.155-.584Zm-3.686 8.015c.166-.34.414-.697.758-1.037.02.348.053.67.098.973.083.56.207 1.048.341 1.477a3.41 3.41 0 0 1-.674.227c-.429.092-.588.019-.614.006l-.004-.001c-.162-.193-.329-.774.095-1.645Zm4.498-2.562a6.362 6.362 0 0 1-1.568 2.73 7.763 7.763 0 0 1-.095-.525 10.294 10.294 0 0 1-.088-1.904c.033-.013.067-.024.1-.036l1.651-.265Zm0 0-1.651.265c.602-.212 1.155-.29 1.651-.265ZM7.536 6.29a6.342 6.342 0 0 0-4.456.331 1 1 0 0 0 .848 1.811 4.342 4.342 0 0 1 3.049-.222c.364.107.568.248.69.37.12.123.203.27.257.454.067.225.087.446.09.69a8.195 8.195 0 0 0-.555-.117c-1.146-.199-2.733-.215-4.262.64-1.271.713-1.796 2.168-1.682 3.448.12 1.326.94 2.679 2.572 3.136 1.48.414 2.913-.045 3.877-.507l.08-.04a1 1 0 0 0 1.96-.281V10.5c0-.053.002-.12.005-.2.012-.417.034-1.16-.168-1.838a3.043 3.043 0 0 0-.755-1.29c-.394-.398-.91-.694-1.547-.881h-.003Zm-.419 5.288c.344.06.647.143.887.222v2.197a7.021 7.021 0 0 1-.905.524c-.792.38-1.682.605-2.473.384-.698-.195-1.06-.742-1.119-1.389-.062-.693.243-1.286.667-1.523.987-.553 2.06-.569 2.943-.415Z",
+  "eye-show-outline": "M12 9.005a4 4 0 1 1 0 8 4 4 0 0 1 0-8Zm0 1.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM12 5.5c4.613 0 8.596 3.15 9.701 7.564a.75.75 0 1 1-1.455.365 8.503 8.503 0 0 0-16.493.004.75.75 0 0 1-1.455-.363A10.003 10.003 0 0 1 12 5.5Z",
+  "eye-hide-outline": "M2.22 2.22a.75.75 0 0 0-.073.976l.073.084 4.034 4.035a9.986 9.986 0 0 0-3.955 5.75.75.75 0 0 0 1.455.364 8.49 8.49 0 0 1 3.58-5.034l1.81 1.81A4 4 0 0 0 14.8 15.86l5.919 5.92a.75.75 0 0 0 1.133-.977l-.073-.084-6.113-6.114.001-.002-1.2-1.198-2.87-2.87h.002L8.719 7.658l.001-.002-1.133-1.13L3.28 2.22a.75.75 0 0 0-1.06 0Zm7.984 9.045 3.535 3.536a2.5 2.5 0 0 1-3.535-3.535ZM12 5.5c-1 0-1.97.148-2.889.425l1.237 1.236a8.503 8.503 0 0 1 9.899 6.272.75.75 0 0 0 1.455-.363A10.003 10.003 0 0 0 12 5.5Zm.195 3.51 3.801 3.8a4.003 4.003 0 0 0-3.801-3.8Z"
 }

From cd6a836bf6a59f0d9ada4910e30ede959466d332 Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Wed, 22 Feb 2023 11:10:48 +0100
Subject: [PATCH 12/94] fix: Resolves icelandic locale not shown properly on UI
 (#6505)

Closes #6484

Co-authored-by: raph941 <45232708+raph941@users.noreply.github.com>
---
 app/javascript/dashboard/i18n/index.js        |  2 +
 .../dashboard/i18n/locale/is/index.js         | 61 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 app/javascript/dashboard/i18n/locale/is/index.js

diff --git a/app/javascript/dashboard/i18n/index.js b/app/javascript/dashboard/i18n/index.js
index 417ad7be3..d32094ad2 100644
--- a/app/javascript/dashboard/i18n/index.js
+++ b/app/javascript/dashboard/i18n/index.js
@@ -33,6 +33,7 @@ import uk from './locale/uk';
 import vi from './locale/vi';
 import zh_CN from './locale/zh_CN';
 import zh_TW from './locale/zh_TW';
+import is from './locale/is';
 
 export default {
   ar,
@@ -70,4 +71,5 @@ export default {
   vi,
   zh_CN,
   zh_TW,
+  is,
 };
diff --git a/app/javascript/dashboard/i18n/locale/is/index.js b/app/javascript/dashboard/i18n/locale/is/index.js
new file mode 100644
index 000000000..0c674eef2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/is/index.js
@@ -0,0 +1,61 @@
+import advancedFilters from './advancedFilters.json';
+import agentBots from './agentBots.json';
+import agentMgmt from './agentMgmt.json';
+import attributesMgmt from './attributesMgmt.json';
+import automation from './automation.json';
+import bulkActions from './bulkActions.json';
+import campaign from './campaign.json';
+import cannedMgmt from './cannedMgmt.json';
+import chatlist from './chatlist.json';
+import contact from './contact.json';
+import contactFilters from './contactFilters.json';
+import conversation from './conversation.json';
+import csatMgmt from './csatMgmt.json';
+import emoji from './emoji.json';
+import generalSettings from './generalSettings.json';
+import helpCenter from './helpCenter.json';
+import inboxMgmt from './inboxMgmt.json';
+import integrationApps from './integrationApps.json';
+import integrations from './integrations.json';
+import labelsMgmt from './labelsMgmt.json';
+import login from './login.json';
+import macros from './macros.json';
+import report from './report.json';
+import resetPassword from './resetPassword.json';
+import setNewPassword from './setNewPassword.json';
+import settings from './settings.json';
+import signup from './signup.json';
+import teamsSettings from './teamsSettings.json';
+import whatsappTemplates from './whatsappTemplates.json';
+
+export default {
+  ...advancedFilters,
+  ...agentBots,
+  ...agentMgmt,
+  ...attributesMgmt,
+  ...automation,
+  ...bulkActions,
+  ...campaign,
+  ...cannedMgmt,
+  ...chatlist,
+  ...contact,
+  ...contactFilters,
+  ...conversation,
+  ...csatMgmt,
+  ...emoji,
+  ...generalSettings,
+  ...helpCenter,
+  ...inboxMgmt,
+  ...integrationApps,
+  ...integrations,
+  ...labelsMgmt,
+  ...login,
+  ...macros,
+  ...report,
+  ...resetPassword,
+  ...setNewPassword,
+  ...settings,
+  ...signup,
+  ...teamsSettings,
+  ...whatsappTemplates,
+};

From 89359332664da02d4820abe2dacf3de173900a0c Mon Sep 17 00:00:00 2001
From: Clairton Rodrigo Heinzen <clairton.rodrigo@gmail.com>
Date: Wed, 22 Feb 2023 09:50:10 -0300
Subject: [PATCH 13/94] fix: First attachment with caption for whatsapp channel
 (#6486)

---
 .../widgets/conversation/ReplyBox.vue          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 6e8c9c34c..416075d92 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -968,15 +968,9 @@ export default {
     },
     getMessagePayloadForWhatsapp(message) {
       const multipleMessagePayload = [];
-      const messagePayload = {
-        conversationId: this.currentChat.id,
-        message,
-        private: false,
-      };
-
-      multipleMessagePayload.push(messagePayload);
 
       if (this.attachedFiles && this.attachedFiles.length) {
+        let caption = message;
         this.attachedFiles.forEach(attachment => {
           const attachedFile = this.globalConfig.directUploadsEnabled
             ? attachment.blobSignedId
@@ -985,10 +979,18 @@ export default {
             conversationId: this.currentChat.id,
             files: [attachedFile],
             private: false,
-            message: '',
+            message: caption,
           };
           multipleMessagePayload.push(attachmentPayload);
+          caption = '';
         });
+      } else {
+        const messagePayload = {
+          conversationId: this.currentChat.id,
+          message,
+          private: false,
+        };
+        multipleMessagePayload.push(messagePayload);
       }
 
       return multipleMessagePayload;

From 267413071430675194b5a4d868d516ccaa68500a Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 23 Feb 2023 16:45:56 +0530
Subject: [PATCH 14/94] chore: Refactors chatlist header css to work with RTL
 (#6520)

authored by 1277421+nithindavid@users.noreply.github.com
---
 .../scss/widgets/_conversation-view.scss      | 16 ++------------
 .../dashboard/components/ChatList.vue         | 19 ++++++++++------
 .../dashboard/components/SidemenuIcon.vue     |  1 -
 .../components/layout/AvailabilityStatus.vue  |  2 +-
 .../widgets/conversation/ChatFilter.vue       | 11 ++++++++++
 .../conversation/search/PopOverSearch.vue     | 19 ++++++++--------
 .../conversation/search/SwitchLayout.vue      | 22 +++++++++----------
 7 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index d46f5d5f8..8a8aab43a 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -93,22 +93,10 @@
     @include flex;
     align-items: center;
     justify-content: space-between;
-    padding: $zero $zero $space-micro;
+    padding: 0 var(--space-normal);
 
     .page-title {
-      margin-bottom: $zero;
-      margin-left: $space-normal;
-    }
-
-    .status--filter {
-      background-color: $color-background-light;
-      border: 1px solid $color-border;
-      float: right;
-      font-size: $font-size-mini;
-      height: $space-medium;
-      margin: 0;
-      padding: $zero $space-medium $zero $space-normal;
-      width: auto;
+      margin-bottom: 0;
     }
   }
 
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 6fd51f747..c7a65376d 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -53,11 +53,10 @@
         <woot-button
           v-else
           v-tooltip.right="$t('FILTER.TOOLTIP_LABEL')"
-          variant="clear"
+          variant="smooth"
           color-scheme="secondary"
           icon="filter"
-          size="small"
-          class="btn-filter"
+          size="tiny"
           @click="onToggleAdvanceFiltersModal"
         />
       </div>
@@ -838,10 +837,6 @@ export default {
   align-items: center;
 }
 
-.btn-filter {
-  margin: 0 var(--space-smaller);
-}
-
 .filter__applied {
   padding: 0 0 var(--space-slab) 0 !important;
   border-bottom: 1px solid var(--color-border);
@@ -850,4 +845,14 @@ export default {
 .delete-custom-view__button {
   margin-right: var(--space-normal);
 }
+
+.tab--chat-type {
+  padding: 0 var(--space-normal);
+
+  ::v-deep {
+    .tabs {
+      padding: 0;
+    }
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/components/SidemenuIcon.vue b/app/javascript/dashboard/components/SidemenuIcon.vue
index dfdfb1596..b80d85a4a 100644
--- a/app/javascript/dashboard/components/SidemenuIcon.vue
+++ b/app/javascript/dashboard/components/SidemenuIcon.vue
@@ -22,7 +22,6 @@ export default {
 </script>
 <style scoped lang="scss">
 .toggle-sidebar {
-  margin-right: var(--space-small);
   margin-left: var(--space-minus-small);
 }
 </style>
diff --git a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
index 0a2698a9a..213dcc94d 100644
--- a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
+++ b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
@@ -181,7 +181,7 @@ export default {
   align-items: center;
   display: flex;
   justify-content: space-between;
-  padding: var(--space-smaller) 0 var(--space-smaller) var(--space-small);
+  padding: var(--space-smaller);
   margin: 0;
 
   .info-wrap {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue
index 4b41f9a50..170d5f661 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue
@@ -44,3 +44,14 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.status--filter {
+  background-color: var(--color-background-light);
+  border: 1px solid var(--color-border);
+  font-size: var(--font-size-mini);
+  height: var(--space-medium);
+  margin: 0 var(--space-smaller);
+  padding: 0 var(--space-medium) 0 var(--space-small);
+  width: auto;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
index 40a0ae159..c62ae2e0f 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -1,10 +1,10 @@
 <template>
   <div v-on-clickaway="closeSearch" class="search-wrap">
-    <div class="search-header--wrap">
+    <div class="search-header--wrap" :class="{ 'is-active': showSearchBox }">
       <woot-sidemenu-icon v-if="!showSearchBox" />
       <div class="search" :class="{ 'is-active': showSearchBox }">
         <div class="icon">
-          <fluent-icon icon="search" class="search--icon" size="28" />
+          <fluent-icon icon="search" class="search--icon" size="16" />
         </div>
         <input
           v-model="searchTerm"
@@ -12,11 +12,12 @@
           :placeholder="$t('CONVERSATION.SEARCH_MESSAGES')"
           @focus="onSearch"
         />
-        <switch-layout
-          :is-on-expanded-layout="isOnExpandedLayout"
-          @toggle="$emit('toggle-conversation-layout')"
-        />
       </div>
+      <switch-layout
+        v-if="!showSearchBox"
+        :is-on-expanded-layout="isOnExpandedLayout"
+        @toggle="$emit('toggle-conversation-layout')"
+      />
     </div>
     <div v-if="showSearchBox" class="results-wrap">
       <div class="show-results">
@@ -162,13 +163,14 @@ export default {
 .search-header--wrap {
   display: flex;
   justify-content: space-between;
+  align-items: center;
   min-height: var(--space-large);
 }
 
 .search {
   display: flex;
   flex: 1;
-  padding: 0;
+  padding: 0 var(--space-smaller);
   border-bottom: 1px solid transparent;
 
   &:hover {
@@ -193,8 +195,7 @@ export default {
 
 .search--icon {
   color: var(--s-600);
-  font-size: var(--font-size-large);
-  padding: 0 var(--space-small) 0 0;
+  margin: 0 var(--space-smaller);
 }
 
 .icon {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
index 5bb45889b..1988e9974 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
@@ -1,16 +1,14 @@
 <template>
-  <div>
-    <woot-button
-      v-tooltip.left="$t('CONVERSATION.SWITCH_VIEW_LAYOUT')"
-      icon="arrow-right-import"
-      size="tiny"
-      variant="smooth"
-      color-scheme="secondary"
-      class="layout-switch__container"
-      :class="{ expanded: isOnExpandedLayout }"
-      @click="toggle"
-    />
-  </div>
+  <woot-button
+    v-tooltip.left="$t('CONVERSATION.SWITCH_VIEW_LAYOUT')"
+    icon="arrow-right-import"
+    size="tiny"
+    variant="smooth"
+    color-scheme="secondary"
+    class="layout-switch__container"
+    :class="{ expanded: isOnExpandedLayout }"
+    @click="toggle"
+  />
 </template>
 
 <script>

From fdf8b3f369b514bb6af1152db8dc34faeba2b33b Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 23 Feb 2023 16:59:48 +0530
Subject: [PATCH 15/94] chore: Refactor utility files for RTL (#6515)

* Chore: Refactor for RTL

* Chore: mInor fixes

* minor fixes
---
 .../dashboard/assets/scss/_layout.scss        |  4 ++--
 .../assets/scss/_utility-helpers.scss         | 10 ++++++++
 .../assets/scss/widgets/_buttons.scss         | 24 +++++++------------
 .../components/NotificationTable.vue          |  2 +-
 .../dashboard/settings/SettingsHeader.vue     |  2 +-
 .../dashboard/settings/account/Index.vue      |  2 +-
 .../dashboard/settings/agentBots/Index.vue    |  2 +-
 .../dashboard/settings/agents/Index.vue       |  2 +-
 .../dashboard/settings/attributes/Index.vue   |  2 +-
 .../dashboard/settings/automation/Index.vue   |  2 +-
 .../dashboard/settings/campaigns/Index.vue    |  2 +-
 .../dashboard/settings/canned/Index.vue       |  2 +-
 .../integrationapps/IntegrationHooks.vue      |  2 +-
 .../integrations/DashboardApps/Index.vue      |  2 +-
 .../settings/integrations/Webhooks/Index.vue  |  2 +-
 .../dashboard/settings/labels/Index.vue       |  2 +-
 .../dashboard/settings/macros/Index.vue       |  2 +-
 .../settings/reports/CsatResponses.vue        |  2 +-
 .../dashboard/settings/reports/Index.vue      |  2 +-
 .../reports/components/WootReports.vue        |  2 +-
 20 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_layout.scss b/app/javascript/dashboard/assets/scss/_layout.scss
index 682ca7670..952274321 100644
--- a/app/javascript/dashboard/assets/scss/_layout.scss
+++ b/app/javascript/dashboard/assets/scss/_layout.scss
@@ -16,12 +16,12 @@ body {
 }
 
 .banner + .app-wrapper {
-  .button--fixed-right-top {
+  .button--fixed-top {
     top: 5.6 * $space-one;
   }
 
   .off-canvas-content {
-    .button--fixed-right-top {
+    .button--fixed-top {
       top: $space-small;
     }
   }
diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
index a54b43b2f..2645e6798 100644
--- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss
+++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
@@ -14,6 +14,10 @@
   margin-left: var(--space-minus-slab);
 }
 
+.margin-right-minus-slab {
+  margin-right: var(--space-minus-slab);
+}
+
 .fs-small {
   font-size: var(--font-size-small);
 }
@@ -75,3 +79,9 @@
   align-items: center;
   display: flex;
 }
+
+.button--fixed-top {
+  position: fixed;
+  right: var(--space-small);
+  top: var(--space-small);
+}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index 15f344ddf..58945ffb5 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -50,22 +50,22 @@ $default-button-height: 4.0rem;
 
     &.secondary {
       border-color: var(--s-200);
-      color: var(--s-700)
+      color: var(--s-700);
     }
 
     &.success {
       border-color: var(--s-200);
-      color: var(--g-700)
+      color: var(--g-700);
     }
 
     &.alert {
       border-color: var(--s-200);
-      color: var(--r-700)
+      color: var(--r-700);
     }
 
     &.warning {
       border-color: var(--s-200);
-      color: var(--y-700)
+      color: var(--y-700);
     }
 
     &:hover {
@@ -116,19 +116,19 @@ $default-button-height: 4.0rem;
     color: var(--w-700);
 
     &.secondary {
-      color: var(--s-700)
+      color: var(--s-700);
     }
 
     &.success {
-      color: var(--g-700)
+      color: var(--g-700);
     }
 
     &.alert {
-      color: var(--r-700)
+      color: var(--r-700);
     }
 
     &.warning {
-      color: var(--y-700)
+      color: var(--y-700);
     }
 
     &:hover {
@@ -205,11 +205,3 @@ $default-button-height: 4.0rem;
   }
 
 }
-
-
-// @TDOD move to utility file
-.button--fixed-right-top {
-  position: fixed;
-  right: $space-small;
-  top: $space-small;
-}
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
index fc68afb40..0c9553275 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
@@ -2,7 +2,7 @@
   <section class="notification--table-wrap">
     <woot-submit-button
       v-if="notificationMetadata.unreadCount"
-      class="button nice success button--fixed-right-top"
+      class="button nice success button--fixed-top"
       :button-text="$t('NOTIFICATIONS_PAGE.MARK_ALL_DONE')"
       :loading="isUpdating"
       @click="onMarkAllDoneClick"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
index 906394a07..63ad2b12f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
@@ -14,7 +14,7 @@
     <router-link
       v-if="showNewButton && isAdmin"
       :to="buttonRoute"
-      class="button success button--fixed-right-top"
+      class="button success button--fixed-top"
     >
       <fluent-icon icon="add-circle" />
       <span class="button__content">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 2757e8a4e..526324da1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -107,7 +107,7 @@
       </div>
 
       <woot-submit-button
-        class="button nice success button--fixed-right-top"
+        class="button nice success button--fixed-top"
         :button-text="$t('GENERAL_SETTINGS.SUBMIT')"
         :loading="isUpdating"
       />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
index b686a4127..6953613f7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
@@ -29,7 +29,7 @@
     </div>
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
     >
       <router-link :to="newAgentBotsURL" class="white-text">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
index 848526791..8656901a7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddPopup()"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
index fc7b6b6b5..9a96db775 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddPopup()"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 9940b05f0..e75689688 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddPopup()"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/Index.vue
index 822c9cb88..b271e3ab8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddPopup"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 16900bbe9..6e8b1165f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddPopup()"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue
index 2c1b8579c..0b92ed5e0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationHooks.vue
@@ -3,7 +3,7 @@
     <woot-button
       v-if="showAddButton"
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddHookModal"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue
index ce0b48e3e..b017d8040 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue
@@ -2,7 +2,7 @@
   <div class="row content-box full-height">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openCreatePopup"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
index 8bd36c0a8..930e0e079 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
@@ -2,7 +2,7 @@
   <div class="row content-box full-height">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddPopup"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
index eee8fd231..42d6eb244 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="add-circle"
       @click="openAddPopup"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
index 31f661a55..2bc381ff1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <router-link
       :to="addAccountScoping('settings/macros/new')"
-      class="button success button--fixed-right-top"
+      class="button success button--fixed-top"
     >
       <fluent-icon icon="add-circle" />
       <span class="button__content">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
index 740006c59..f72ad8bad 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
@@ -9,7 +9,7 @@
     />
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="arrow-download"
       @click="downloadReports"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index e3d56a7fc..15db4d805 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="arrow-download"
       @click="downloadAgentReports"
     >
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 a28d213ab..aeeab94fe 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
@@ -2,7 +2,7 @@
   <div class="column content-box">
     <woot-button
       color-scheme="success"
-      class-names="button--fixed-right-top"
+      class-names="button--fixed-top"
       icon="arrow-download"
       @click="downloadReports"
     >

From 87aabfbb9a9237d943bacb3c3f1feb15003d86f1 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 23 Feb 2023 17:29:28 +0530
Subject: [PATCH 16/94] chore: Refactor integrations pages for RTL (#6516)

* Refactor integrations

* Adjust spacing for integration item

---------

Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
---
 .../assets/scss/views/settings/integrations.scss     | 12 +++++++-----
 .../settings/integrationapps/IntegrationItem.vue     |  4 ++--
 .../integrationapps/SingleIntegrationHooks.vue       |  4 ++--
 .../dashboard/settings/integrations/Integration.vue  |  4 ++--
 .../settings/integrations/IntegrationHelpText.vue    |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/views/settings/integrations.scss b/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
index 7720c8d3e..590890499 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
@@ -9,7 +9,6 @@
     .integration--image {
       display: flex;
       height: 10rem;
-      margin-right: $space-normal;
       width: 10rem;
 
       img {
@@ -18,12 +17,15 @@
       }
     }
 
-    .integration--title {
-      font-size: $font-size-large;
+    .integration--type {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      margin: 0 var(--space-normal);
     }
 
-    .integration--description {
-      padding-right: $space-medium;
+    .integration--title {
+      font-size: var(--font-size-large);
     }
 
     .button-wrap {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
index 2e822559f..0fea6d17a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
@@ -3,11 +3,11 @@
     <div class="integration--image">
       <img :src="'/dashboard/images/integrations/' + integrationLogo" />
     </div>
-    <div class="column">
+    <div class="integration--type column">
       <h3 class="integration--title">
         {{ integrationName }}
       </h3>
-      <p class="integration--description">
+      <p>
         {{
           useInstallationName(
             integrationDescription,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
index 24d9f2610..8d263653f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
@@ -6,11 +6,11 @@
           <div class="integration--image">
             <img :src="'/dashboard/images/integrations/' + integration.logo" />
           </div>
-          <div class="column">
+          <div class="integration--type column">
             <h3 class="integration--title">
               {{ integration.name }}
             </h3>
-            <p class="integration--description">
+            <p>
               {{ integration.description }}
             </p>
           </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
index 7d4af88c0..d3885bac0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
@@ -3,11 +3,11 @@
     <div class="integration--image">
       <img :src="'/dashboard/images/integrations/' + integrationLogo" />
     </div>
-    <div class="column">
+    <div class="integration--type column">
       <h3 class="integration--title">
         {{ integrationName }}
       </h3>
-      <p class="integration--description">
+      <p>
         {{
           useInstallationName(
             integrationDescription,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
index 2e6d00dac..c7b8537e0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row">
     <div class="column">
-      <div class="integration--description">
+      <div>
         <h5>{{ $t('INTEGRATION_SETTINGS.SLACK.HELP_TEXT.TITLE') }}</h5>
         <p>
           <span

From 409466bbd5292a8f7e73e8023bdd916d55c940ff Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 23 Feb 2023 17:50:44 +0530
Subject: [PATCH 17/94] chore: RTL configuration (#6521)

* chore: RTL configuration

* Adds scss file
---
 app/javascript/dashboard/App.vue              |  10 +-
 .../dashboard/assets/scss/_rtl.scss           | 436 ++++++++++++++++++
 .../dashboard/assets/scss/_woot.scss          |   1 +
 .../advancedFilterItems/languages.js          |   5 +
 .../specs/languages.spec.js                   |   9 +-
 .../dashboard/settings/account/Index.vue      |  13 +-
 app/javascript/shared/mixins/rtlMixin.js      |  11 +
 .../shared/mixins/specs/rtlMixin.spec.js      |  29 ++
 8 files changed, 511 insertions(+), 3 deletions(-)
 create mode 100644 app/javascript/dashboard/assets/scss/_rtl.scss
 create mode 100644 app/javascript/shared/mixins/rtlMixin.js
 create mode 100644 app/javascript/shared/mixins/specs/rtlMixin.spec.js

diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index 0ff94efa5..ef4bd2eb3 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -1,5 +1,10 @@
 <template>
-  <div v-if="!authUIFlags.isFetching" id="app" class="app-wrapper app-root">
+  <div
+    v-if="!authUIFlags.isFetching"
+    id="app"
+    class="app-wrapper app-root"
+    :class="{ 'app-rtl--wrapper': isRTLView }"
+  >
     <update-banner :latest-chatwoot-version="latestChatwootVersion" />
     <transition name="fade" mode="out-in">
       <router-view />
@@ -22,6 +27,7 @@ import NetworkNotification from './components/NetworkNotification';
 import UpdateBanner from './components/app/UpdateBanner.vue';
 import vueActionCable from './helper/actionCable';
 import WootSnackbarBox from './components/SnackbarContainer';
+import rtlMixin from 'shared/mixins/rtlMixin';
 import {
   registerSubscription,
   verifyServiceWorkerExistence,
@@ -38,6 +44,8 @@ export default {
     WootSnackbarBox,
   },
 
+  mixins: [rtlMixin],
+
   data() {
     return {
       showAddAccountModal: false,
diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
new file mode 100644
index 000000000..42c974f37
--- /dev/null
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -0,0 +1,436 @@
+.app-rtl--wrapper {
+  direction: rtl;
+
+  // Primary sidebar
+  .primary--sidebar {
+    border-left: 1px solid var(--s-50);
+    border-right: 0;
+
+    .options-menu.dropdown-pane {
+      right: var(--space-smaller);
+
+      .auto-offline--toggle {
+        padding: var(--space-smaller) var(--space-one) var(--space-smaller)
+          var(--space-smaller);
+      }
+    }
+  }
+
+  // Secondary sidebar
+  .secondary-sidebar {
+    .secondary-menu {
+      border-left: 1px solid var(--s-50);
+      border-right: 0;
+
+      .nested.vertical.menu {
+        align-items: flex-start;
+
+        li {
+          direction: initial;
+        }
+      }
+
+      .secondary-menu--icon {
+        margin-left: var(--space-smaller);
+        margin-right: unset;
+      }
+
+      .account-context--group .account-context--switch-group {
+        --overlay-shadow: linear-gradient(
+          to left,
+          rgba(255, 255, 255, 0) 0%,
+          rgba(255, 255, 255, 1) 50%
+        );
+        background-image: var(--overlay-shadow);
+      }
+
+      // Help center sidebar
+      .sidebar-header--wrap .header-title--wrap {
+        margin-left: unset;
+        margin-right: var(--space-small);
+      }
+    }
+  }
+
+  // Woot button
+  .button {
+    .icon--emoji + .button__content {
+      padding-left: 0;
+      padding-right: var(--space-small);
+    }
+
+    .icon--font + .button__content {
+      padding-left: 0;
+      padding-right: var(--space-small);
+    }
+
+    .icon + .button__content {
+      padding-left: 0;
+      padding-right: var(--space-small);
+    }
+  }
+
+  // Settings header
+  .settings-header {
+    .header--icon {
+      margin-left: 0;
+      margin-right: $space-small;
+    }
+  }
+
+  .settings.back-button {
+    direction: initial;
+    margin-left: var(--space-normal);
+    margin-right: var(--space-smaller);
+  }
+
+  // Settings header action button
+  .button--fixed-top {
+    left: $space-small;
+    position: fixed;
+    right: unset;
+    top: $space-small;
+  }
+
+  // Woot Tabs
+  .tabs-title {
+    &:first-child {
+      margin-left: $space-slab;
+      margin-right: unset;
+    }
+
+    &:last-child {
+      margin-left: unset;
+      margin-right: $space-slab;
+    }
+  }
+
+  // woot tables
+  table,
+  thead,
+  th {
+    text-align: right;
+  }
+
+  // Table footer
+  .footer {
+    .page-meta {
+      direction: initial;
+    }
+  }
+
+  // Wizard box
+  .wizard-box {
+    direction: initial;
+  }
+
+  // Conversation details
+  .conversation-details-wrap {
+    .conv-header {
+      .user {
+        margin-left: var(--space-normal);
+        margin-right: unset;
+
+        .user--profile__meta {
+          margin-left: unset;
+          margin-right: $space-slab;
+        }
+      }
+
+      .actions--container .resolve-actions {
+        margin-left: unset;
+        margin-right: var(--space-small);
+      }
+    }
+
+    .conversation-panel {
+      // Message text
+      .text-content {
+        p {
+          unicode-bidi: plaintext;
+        }
+
+        ul {
+          padding-left: unset;
+          padding-right: var(--space-two);
+        }
+
+        li {
+          text-align: right;
+        }
+      }
+
+      // Message items and actions
+      li {
+        &.right {
+          .sender--info {
+            padding: var(--space-small) var(--space-smaller)
+              var(--space-smaller) 0;
+          }
+
+          .context-menu-wrap {
+            margin-left: 0;
+            margin-right: auto;
+          }
+        }
+      }
+    }
+
+    // Conversation footer
+    .conversation-footer {
+      .preview-item {
+        direction: initial;
+      }
+    }
+
+    // Custom attributes section in conversation sidebar
+    .conversation-sidebar-wrap .checkbox-wrap {
+      .checkbox {
+        margin-left: var(--space-small);
+      }
+    }
+
+    // Conversation sidebar toggle button
+    .sidebar-toggle--button {
+      transform: rotate(180deg);
+    }
+
+    // Conversation sidebar close button
+    .close-button--rtl {
+      transform: rotate(180deg);
+    }
+
+    // Resolve actions button
+    .resolve-actions {
+      .button-group .button:first-child {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: var(--border-radius-normal);
+        border-top-left-radius: 0;
+        border-top-right-radius: var(--border-radius-normal);
+      }
+
+      .button-group .button:last-child {
+        border-bottom-left-radius: var(--border-radius-normal);
+        border-bottom-right-radius: 0;
+        border-top-left-radius: var(--border-radius-normal);
+        border-top-right-radius: 0;
+      }
+    }
+  }
+
+  // Conversation list
+  .conversations-list-wrap {
+    border-right: 0;
+
+    .conversation {
+      .conversation--meta {
+        left: $space-normal;
+        right: unset;
+
+        .unread {
+          margin-left: unset;
+          margin-right: auto;
+        }
+      }
+
+      .show-more--button {
+        transform: rotate(180deg);
+      }
+    }
+
+    .search-header--wrap .search--input {
+      text-align: right;
+    }
+
+    // Secondary sidebar toggle button
+    .toggle-sidebar {
+      margin-left: 0;
+      margin-right: var(--space-minus-small);
+      transform: rotate(180deg);
+    }
+
+    // Bulk actions
+    .bulk-action__container {
+      .triangle {
+        left: var(--triangle-position);
+        right: unset;
+      }
+
+      .bulk-action__agents {
+        left: var(--space-small);
+        right: unset;
+      }
+
+      .labels-container {
+        left: var(--space-small);
+        right: unset;
+
+        .label-checkbox {
+          margin: 0 0 0 var(--space-one);
+        }
+      }
+
+      .actions-container {
+        left: var(--space-small);
+        right: unset;
+      }
+
+      .bulk-action__teams {
+        left: var(--space-small);
+        right: unset;
+      }
+    }
+  }
+
+  // Contact notes
+  .card.note-wrap {
+    .time-stamp {
+      unicode-bidi: plaintext;
+    }
+  }
+
+  // Labels
+  .label {
+    direction: initial;
+  }
+
+  // Notification panel
+  .notification-wrap {
+    left: 0;
+    right: var(--space-jumbo);
+
+    .action-button {
+      margin-left: var(--space-small);
+      margin-right: 0;
+    }
+
+    .notification-content--wrap {
+      margin-left: 0;
+      margin-right: var(--space-slab);
+    }
+  }
+
+  //   Help center
+  .article-container .row--article-block {
+    td:last-child {
+      direction: initial;
+    }
+  }
+
+  .header-left-wrap .page-title {
+    margin-right: var(--space-slab) !important;
+  }
+
+  .portal-container .container {
+    margin-left: unset !important;
+    margin-right: var(--space-small);
+
+    .configuration-items--wrap {
+      margin-left: var(--space-mega);
+      margin-right: unset !important;
+    }
+
+    thead th {
+      padding-left: var(--space-one);
+      padding-right: 0;
+    }
+
+    tbody td {
+      padding-left: var(--space-one);
+      padding-right: 0;
+    }
+  }
+
+  .portal-popover__container .portal {
+    .actions-container {
+      margin-left: unset;
+      margin-right: var(--space-one);
+    }
+  }
+
+  .edit-article--container {
+    .header-right--wrap {
+      .button-group .button:first-child {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: var(--border-radius-normal);
+        border-top-left-radius: 0;
+        border-top-right-radius: var(--border-radius-normal);
+      }
+
+      .button-group .button:last-child {
+        border-bottom-left-radius: var(--border-radius-normal);
+        border-bottom-right-radius: 0;
+        border-top-left-radius: var(--border-radius-normal);
+        border-top-right-radius: 0;
+      }
+    }
+
+    .header-left--wrap {
+      .back-button {
+        direction: initial;
+      }
+    }
+
+    .article--buttons {
+      .dropdown-pane {
+        left: 0;
+        position: absolute;
+        right: unset;
+      }
+    }
+
+    .sidebar-button {
+      transform: rotate(180deg);
+    }
+  }
+
+  .article-settings--container {
+    border-left: 0;
+    border-right: 1px solid var(--color-border-light);
+    flex-direction: row-reverse;
+    margin-left: 0;
+    margin-right: var(--space-normal);
+    padding-left: 0;
+    padding-right: var(--space-normal);
+  }
+
+  .category-list--container .header-left--wrap {
+    direction: initial;
+    justify-content: flex-end;
+  }
+
+  // Widget builder
+  .widget-builder-container .widget-preview {
+    direction: initial;
+  }
+
+  // Other changes
+
+  .account-selector--wrap {
+    direction: initial;
+  }
+
+  .inbox--name {
+    direction: initial;
+  }
+
+  .colorpicker--chrome {
+    direction: initial;
+  }
+
+  .mention--box {
+    direction: initial;
+  }
+
+  .contact--details .contact--bio {
+    direction: ltr;
+  }
+
+  .merge-contacts .child-contact-wrap {
+    direction: ltr;
+  }
+
+  .contact--form .input-group {
+    direction: initial;
+  }
+}
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index 6041b286a..ce06475a7 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -41,6 +41,7 @@
 @import 'layout';
 @import 'animations';
 @import 'foundation-custom';
+@import 'rtl';
 
 @import 'widgets/buttons';
 @import 'widgets/conv-header';
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
index 31529f0c7..c1dcfa790 100644
--- a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js
@@ -739,4 +739,9 @@ export const getLanguageName = (languageCode = '') => {
   return languageObj.name || '';
 };
 
+export const getLanguageDirection = (languageCode = '') => {
+  const rtlLanguageIds = ['ar', 'as', 'fa', 'he', 'ku', 'ur'];
+  return rtlLanguageIds.includes(languageCode);
+};
+
 export default languages;
diff --git a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/languages.spec.js b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/languages.spec.js
index 52bc981fd..890850500 100644
--- a/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/languages.spec.js
+++ b/app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/specs/languages.spec.js
@@ -1,4 +1,4 @@
-import { getLanguageName } from '../languages';
+import { getLanguageName, getLanguageDirection } from '../languages';
 
 describe('#getLanguageName', () => {
   it('Returns correct language name', () => {
@@ -8,3 +8,10 @@ describe('#getLanguageName', () => {
     expect(getLanguageName('')).toEqual('');
   });
 });
+
+describe('#getLanguageDirection', () => {
+  it('Returns correct language direction', () => {
+    expect(getLanguageDirection('es')).toEqual(false);
+    expect(getLanguageDirection('ar')).toEqual(true);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 526324da1..754af4ddd 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -125,9 +125,11 @@ import configMixin from 'shared/mixins/configMixin';
 import accountMixin from '../../../../mixins/account';
 import { FEATURE_FLAGS } from '../../../../featureFlags';
 const semver = require('semver');
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import { getLanguageDirection } from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
 
 export default {
-  mixins: [accountMixin, alertMixin, configMixin],
+  mixins: [accountMixin, alertMixin, configMixin, uiSettingsMixin],
   data() {
     return {
       id: '',
@@ -249,11 +251,20 @@ export default {
           auto_resolve_duration: this.autoResolveDuration,
         });
         this.$root.$i18n.locale = this.locale;
+        this.getAccount(this.id).locale = this.locale;
+        this.updateDirectionView(this.locale);
         this.showAlert(this.$t('GENERAL_SETTINGS.UPDATE.SUCCESS'));
       } catch (error) {
         this.showAlert(this.$t('GENERAL_SETTINGS.UPDATE.ERROR'));
       }
     },
+
+    updateDirectionView(locale) {
+      const isRTLSupported = getLanguageDirection(locale);
+      this.updateUISettings({
+        rtl_view: isRTLSupported,
+      });
+    },
   },
 };
 </script>
diff --git a/app/javascript/shared/mixins/rtlMixin.js b/app/javascript/shared/mixins/rtlMixin.js
new file mode 100644
index 000000000..6267c9c16
--- /dev/null
+++ b/app/javascript/shared/mixins/rtlMixin.js
@@ -0,0 +1,11 @@
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+
+export default {
+  mixins: [uiSettingsMixin],
+  computed: {
+    isRTLView() {
+      const { rtl_view: isRTLView } = this.uiSettings;
+      return isRTLView;
+    },
+  },
+};
diff --git a/app/javascript/shared/mixins/specs/rtlMixin.spec.js b/app/javascript/shared/mixins/specs/rtlMixin.spec.js
new file mode 100644
index 000000000..10e6a969b
--- /dev/null
+++ b/app/javascript/shared/mixins/specs/rtlMixin.spec.js
@@ -0,0 +1,29 @@
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import { shallowMount } from '@vue/test-utils';
+import rtlMixin from 'shared/mixins/rtlMixin';
+
+describe('rtlMixin', () => {
+  it('returns is direction right-to-left view', () => {
+    const Component = {
+      render() {},
+      mixins: [rtlMixin, uiSettingsMixin],
+      data() {
+        return { uiSettings: { rtl_view: true } };
+      },
+    };
+    const wrapper = shallowMount(Component);
+    expect(wrapper.vm.isRTLView).toBe(true);
+  });
+
+  it('returns is direction left-to-right view', () => {
+    const Component = {
+      render() {},
+      mixins: [rtlMixin, uiSettingsMixin],
+      data() {
+        return { uiSettings: { rtl_view: false } };
+      },
+    };
+    const wrapper = shallowMount(Component);
+    expect(wrapper.vm.isRTLView).toBe(false);
+  });
+});

From 6407745571a3498ada226a463b40813cbd46680b Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:18:28 +0530
Subject: [PATCH 18/94] chore: Woot tabs for RTL(#6518)

---
 .../dashboard/assets/scss/widgets/_tabs.scss  | 34 +++++++++----------
 .../dashboard/settings/inbox/Settings.vue     |  7 ++++
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
index 9a6f6951c..2f49945cd 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
@@ -12,7 +12,7 @@
   border-top-width: 0;
   display: flex;
   min-width: var(--space-mega);
-  padding: $zero $space-normal;
+  padding: 0 var(--space-normal);
 }
 
 .tabs--with-scroll {
@@ -37,26 +37,26 @@
 
   .tabs-title {
     a {
-      font-size: $font-size-default;
-      font-weight: $font-weight-medium;
-      padding-bottom: $space-slab;
-      padding-top: $space-slab;
+      font-size: var(--font-size-default);
+      font-weight: var(--font-weight-medium);
+      padding-bottom: var(--space-slab);
+      padding-top: var(--space-slab);
     }
   }
 }
 
 .tabs-title {
   flex-shrink: 0;
-  margin: $zero $space-slab;
+  margin: 0 var(--space-slab);
 
   .badge {
-    background: $color-background;
-    border-radius: $space-small;
-    color: $color-gray;
-    font-size: $font-size-micro;
-    font-weight: $font-weight-black;
-    margin-left: $space-smaller;
-    padding: $space-smaller;
+    background: var(--color-background);
+    border-radius: var(--space-small);
+    color: var(--color-gray);
+    font-size: var(--font-size-micro);
+    font-weight: var(--font-weight-black);
+    margin: 0 var(--space-smaller);
+    padding: var(--space-smaller);
   }
 
   &:first-child {
@@ -80,7 +80,7 @@
     color: $medium-gray;
     display: flex;
     flex-direction: row;
-    font-size: $font-size-small;
+    font-size: var(--font-size-small);
     position: relative;
     top: 1px;
     transition: border-color 0.15s $swift-ease-out-function;
@@ -88,13 +88,13 @@
 
   &.is-active {
     a {
-      border-bottom-color: $color-woot;
-      color: $color-woot;
+      border-bottom-color: var(--color-woot);
+      color: var(--color-woot);
     }
 
     .badge {
       background: $color-extra-light-blue;
-      color: $color-woot;
+      color: var(--color-woot);
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index e986362ba..8011bc5a4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -5,6 +5,7 @@
       :header-title="inboxName"
     >
       <woot-tabs
+        class="settings--tabs"
         :index="selectedTabIndex"
         :border="false"
         @change="onTabChange"
@@ -669,6 +670,12 @@ export default {
 .settings {
   background: $color-white;
 
+  .settings--tabs {
+    ::v-deep .tabs {
+      padding: 0;
+    }
+  }
+
   .settings--content {
     div:last-child {
       border-bottom: 0;

From 71f2b27728cde74aabb620611802cee8fc25cd1b Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Thu, 23 Feb 2023 19:16:07 +0530
Subject: [PATCH 19/94] fix: ActiveRecord::RecordNotFound Couldn't find
 Channel::WebWidget (#6523)

* fix: resucue ActiveRecord::RecordNotFound for webwidget controller

* chore: add rails.log
---
 app/controllers/widgets_controller.rb       | 3 +++
 spec/controllers/widgets_controller_spec.rb | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index 9639b28b2..ac26a36c5 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -18,6 +18,9 @@ class WidgetsController < ActionController::Base
 
   def set_web_widget
     @web_widget = ::Channel::WebWidget.find_by!(website_token: permitted_params[:website_token])
+  rescue ActiveRecord::RecordNotFound
+    Rails.logger.error('web widget does not exist')
+    render json: { error: 'web widget does not exist' }, status: :not_found
   end
 
   def set_token
diff --git a/spec/controllers/widgets_controller_spec.rb b/spec/controllers/widgets_controller_spec.rb
index 8b955b6f6..71aaa084c 100644
--- a/spec/controllers/widgets_controller_spec.rb
+++ b/spec/controllers/widgets_controller_spec.rb
@@ -33,5 +33,13 @@ describe '/widget', type: :request do
       expect(response).to have_http_status(:unauthorized)
       expect(response.body).to include('Account is suspended')
     end
+
+    it 'returns 404 if the webwidget is deleted' do
+      web_widget.delete
+
+      get widget_url(website_token: web_widget.website_token)
+      expect(response).to have_http_status(:not_found)
+      expect(response.body).to include('web widget does not exist')
+    end
   end
 end

From 60f953cd27fbb7b826522536bc94f027d638ef27 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 23 Feb 2023 19:50:49 +0530
Subject: [PATCH 20/94] chore: Refactor reports for RTL (#6517)

* Refactor reports

* fix: spacing issues and minor fixes

---------

Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/assets/scss/_date-picker.scss   |  4 +-
 .../assets/scss/_foundation-custom.scss       |  8 ++--
 .../assets/scss/_utility-helpers.scss         |  4 --
 .../assets/scss/plugins/_multiselect.scss     |  2 +-
 .../assets/scss/widgets/_reports.scss         | 13 ++----
 .../conversation/ConversationHeader.vue       |  9 ++--
 .../conversationBulkActions/AgentSelector.vue |  3 +-
 .../dashboard/contacts/components/Header.vue  |  8 ++--
 .../contacts/pages/ContactManageView.vue      |  2 +-
 .../settings/campaigns/AddCampaign.vue        |  1 +
 .../integrations/Webhooks/WebhookForm.vue     |  2 +-
 .../reports/components/FilterSelector.vue     | 18 +++-----
 .../reports/components/ReportFilters.vue      | 46 +++++++++++--------
 13 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_date-picker.scss b/app/javascript/dashboard/assets/scss/_date-picker.scss
index c9b4b7b12..ece12c999 100644
--- a/app/javascript/dashboard/assets/scss/_date-picker.scss
+++ b/app/javascript/dashboard/assets/scss/_date-picker.scss
@@ -14,11 +14,11 @@
   }
 
   .mx-input {
-    border: 1px solid var(--color-border);
+    border: 1px solid var(--s-200);
     border-radius: var(--border-radius-normal);
     box-shadow: none;
     display: flex;
-    height: 4.6rem;
+    height: 4.0rem;
   }
 
   .mx-input:disabled,
diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index 2f817b125..5753e7593 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -7,6 +7,10 @@
   }
 }
 
+select {
+  height: 4.0rem;
+}
+
 .card {
   margin-bottom: var(--space-small);
   padding: var(--space-normal);
@@ -64,7 +68,3 @@ code {
 .padding-right-small {
   padding-right: var(--space-one);
 }
-
-.margin-right-small {
-  margin-right: var(--space-small);
-}
diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
index 2645e6798..06c963a93 100644
--- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss
+++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
@@ -1,7 +1,3 @@
-.margin-right-small {
-  margin-right: var(--space-small);
-}
-
 .margin-bottom-small {
   margin-bottom: var(--space-small);
 }
diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index 9fcf1ea66..f1548fbea 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -169,7 +169,7 @@
 }
 
 .multiselect-wrap--small {
-  $multiselect-height: 3.8rem;
+  $multiselect-height: 4.0rem;
 
   .multiselect__tags,
   .multiselect__input {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reports.scss b/app/javascript/dashboard/assets/scss/widgets/_reports.scss
index 742129655..d55dbd5a3 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reports.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reports.scss
@@ -1,11 +1,3 @@
-.date-picker {
-  margin-left: var(--space-smaller);
-}
-
-.margin-left-small {
-  margin-left: var(--space-smaller);
-}
-
 .reports-option__rounded--item {
   border-radius: 100%;
   height: var(--space-two);
@@ -26,6 +18,10 @@
   display: flex;
 }
 
+.reports-option__title {
+  margin: 0 var(--space-small);
+}
+
 .business-hours {
   align-items: center;
   display: flex;
@@ -37,6 +33,7 @@
 
 .business-hours-text {
   font-size: var(--font-size-small);
+  margin: 0 var(--space-small);
 }
 
 .switch {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 6bcd9a790..fddfc3309 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -24,16 +24,13 @@
             <inbox-name
               v-if="hasMultipleInboxes"
               :inbox="inbox"
-              class="margin-right-small"
+              class="margin-right-1"
             />
-            <span
-              v-if="isSnoozed"
-              class="snoozed--display-text margin-right-small"
-            >
+            <span v-if="isSnoozed" class="snoozed--display-text margin-right-1">
               {{ snoozedDisplayText }}
             </span>
             <woot-button
-              class="user--profile__button margin-right-small"
+              class="user--profile__button margin-right-1"
               size="small"
               variant="link"
               @click="$emit('contact-panel-toggle')"
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index 2baa065d3..ca7c0fbfb 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bulk-action__agents">
+  <div v-on-clickaway="onClose" class="bulk-action__agents">
     <div class="triangle" :style="cssVars">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path
@@ -50,7 +50,6 @@
                 :status="agent.availability_status"
                 :username="agent.name"
                 size="22px"
-                class="margin-right-small"
               />
               <span class="reports-option__title">{{ agent.name }}</span>
             </div>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 2228320bb..e801bcc48 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -29,7 +29,7 @@
         </div>
         <woot-button
           v-if="hasActiveSegments"
-          class="margin-right-small clear"
+          class="margin-right-1 clear"
           color-scheme="alert"
           icon="delete"
           @click="onToggleDeleteSegmentsModal"
@@ -39,7 +39,7 @@
         <div v-if="!hasActiveSegments" class="filters__button-wrap">
           <div v-if="hasAppliedFilters" class="filters__applied-indicator" />
           <woot-button
-            class="margin-right-small clear"
+            class="margin-right-1 clear"
             color-scheme="secondary"
             data-testid="create-new-contact"
             icon="filter"
@@ -51,7 +51,7 @@
 
         <woot-button
           v-if="hasAppliedFilters && !hasActiveSegments"
-          class="margin-right-small clear"
+          class="margin-right-1 clear"
           color-scheme="alert"
           variant="clear"
           icon="save"
@@ -60,7 +60,7 @@
           {{ $t('CONTACTS_PAGE.FILTER_CONTACTS_SAVE') }}
         </woot-button>
         <woot-button
-          class="margin-right-small clear"
+          class="margin-right-1 clear"
           color-scheme="success"
           icon="person-add"
           data-testid="create-new-contact"
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
index cc4eaf4b6..2c867859a 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
@@ -13,7 +13,7 @@
         :src="contact.thumbnail"
         :username="contact.name"
         size="32px"
-        class="margin-right-small"
+        class="margin-right-1"
       />
     </settings-header>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
index aa3f18318..b09b23f24 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
@@ -58,6 +58,7 @@
 
         <label
           v-if="isOnOffType"
+          class="multiselect-wrap--small"
           :class="{ error: $v.selectedAudience.$error }"
         >
           {{ $t('CAMPAIGN.ADD.FORM.AUDIENCE.LABEL') }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
index 5ab54cfb2..0463dd07b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -26,7 +26,7 @@
           type="checkbox"
           :value="event"
           name="subscriptions"
-          class="margin-right-small"
+          class="margin-right-1"
         />
         <span class="fs-small">
           {{ `${getEventLabel(event)} (${event})` }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
index 848555a4d..989a18e40 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex-container flex-dir-column medium-flex-dir-row">
-    <div class="small-12 medium-3 pull-right">
+    <div class="small-12 medium-3 pull-right multiselect-wrap--small">
       <multiselect
         v-model="currentDateRangeSelection"
         track-by="name"
@@ -17,6 +17,7 @@
     </div>
     <woot-date-range-picker
       v-if="isDateRangeSelected"
+      class="margin-left-1"
       show-range
       :value="customDateRange"
       :confirm-text="$t('REPORT.CUSTOM_DATE_RANGE.CONFIRM')"
@@ -25,7 +26,7 @@
     />
     <div
       v-if="notLast7Days && groupByFilter"
-      class="small-12 medium-3 pull-right margin-left-small"
+      class="small-12 medium-3 pull-right margin-left-1 margin-right-1 multiselect-wrap--small"
     >
       <p aria-hidden="true" class="hide">
         {{ $t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL') }}
@@ -43,7 +44,7 @@
     </div>
     <div
       v-if="agentsFilter"
-      class="small-12 medium-3 pull-right margin-left-small"
+      class="small-12 medium-3 pull-right margin-left-1 margin-right-1 multiselect-wrap--small"
     >
       <multiselect
         v-model="selectedAgents"
@@ -65,7 +66,7 @@
       v-if="showBusinessHoursSwitch"
       class="small-12 medium-3 business-hours"
     >
-      <span class="business-hours-text margin-right-small">
+      <span class="business-hours-text margin-right-1">
         {{ $t('REPORT.BUSINESS_HOURS') }}
       </span>
       <span>
@@ -76,13 +77,14 @@
 </template>
 <script>
 import WootDateRangePicker from 'dashboard/components/ui/DateRangePicker.vue';
-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';
 import endOfDay from 'date-fns/endOfDay';
 
+const CUSTOM_DATE_RANGE_ID = 5;
+
 export default {
   components: {
     WootDateRangePicker,
@@ -207,9 +209,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-.date-picker {
-  margin-left: var(--space-smaller);
-}
-</style>
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 63c483b08..57c9d352f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="flex-container flex-dir-column medium-flex-dir-row">
-    <div v-if="type === 'agent'" class="small-12 medium-3 pull-right">
+    <div
+      v-if="type === 'agent'"
+      class="small-12 medium-3 pull-right multiselect-wrap--small"
+    >
       <p>
         {{ $t('AGENT_REPORTS.FILTER_DROPDOWN_LABEL') }}
       </p>
@@ -21,7 +24,6 @@
               :status="props.option.availability_status"
               :username="props.option.name"
               size="22px"
-              class="margin-right-small"
             />
             <span class="reports-option__desc">
               <span class="reports-option__title">{{ props.option.name }}</span>
@@ -35,14 +37,16 @@
               :status="props.option.availability_status"
               :username="props.option.name"
               size="22px"
-              class="margin-right-small"
             />
-            <p>{{ props.option.name }}</p>
+            <p class="reports-option__title">{{ props.option.name }}</p>
           </div>
         </template>
       </multiselect>
     </div>
-    <div v-else-if="type === 'label'" class="small-12 medium-3 pull-right">
+    <div
+      v-else-if="type === 'label'"
+      class="small-12 medium-3 pull-right multiselect-wrap--small"
+    >
       <p>
         {{ $t('LABEL_REPORTS.FILTER_DROPDOWN_LABEL') }}
       </p>
@@ -60,7 +64,7 @@
           <div class="reports-option__wrap">
             <div
               :style="{ backgroundColor: props.option.color }"
-              class="reports-option__rounded--item margin-right-small"
+              class="reports-option__rounded--item"
             />
             <span class="reports-option__desc">
               <span class="reports-option__title">
@@ -88,7 +92,7 @@
         </template>
       </multiselect>
     </div>
-    <div v-else class="small-12 medium-3 pull-right">
+    <div v-else class="small-12 medium-3 pull-right multiselect-wrap--small">
       <p>
         <template v-if="type === 'inbox'">
           {{ $t('INBOX_REPORTS.FILTER_DROPDOWN_LABEL') }}
@@ -115,7 +119,9 @@
         @input="changeFilterSelection"
       />
     </div>
-    <div class="small-12 medium-3 pull-right margin-left-small">
+    <div
+      class="small-12 medium-3 pull-right margin-right-1 margin-left-1 multiselect-wrap--small"
+    >
       <p>
         {{ $t('REPORT.DURATION_FILTER_LABEL') }}
       </p>
@@ -133,17 +139,21 @@
         @select="changeDateSelection"
       />
     </div>
-    <woot-date-range-picker
-      v-if="isDateRangeSelected"
-      show-range
-      :value="customDateRange"
-      :confirm-text="$t('REPORT.CUSTOM_DATE_RANGE.CONFIRM')"
-      :placeholder="$t('REPORT.CUSTOM_DATE_RANGE.PLACEHOLDER')"
-      @change="onChange"
-    />
+    <div v-if="isDateRangeSelected" class="">
+      <p>
+        {{ $t('REPORT.CUSTOM_DATE_RANGE.PLACEHOLDER') }}
+      </p>
+      <woot-date-range-picker
+        show-range
+        :value="customDateRange"
+        :confirm-text="$t('REPORT.CUSTOM_DATE_RANGE.CONFIRM')"
+        :placeholder="$t('REPORT.CUSTOM_DATE_RANGE.PLACEHOLDER')"
+        @change="onChange"
+      />
+    </div>
     <div
       v-if="notLast7Days"
-      class="small-12 medium-3 pull-right margin-left-small"
+      class="small-12 medium-3 pull-right margin-right-1 margin-left-1 multiselect-wrap--small"
     >
       <p>
         {{ $t('REPORT.GROUP_BY_FILTER_DROPDOWN_LABEL') }}
@@ -160,7 +170,7 @@
       />
     </div>
     <div class="small-12 medium-3 business-hours">
-      <span class="business-hours-text margin-right-small">
+      <span class="business-hours-text">
         {{ $t('REPORT.BUSINESS_HOURS') }}
       </span>
       <span>

From e7d0bf8a1b8accd4ba070e998625312e63745b93 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 23 Feb 2023 18:11:46 -0800
Subject: [PATCH 21/94] chore: Display CSAT responses in the message itself.
 (#6529)

---
 .../components/widgets/conversation/Message.vue          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 461a02116..b4179b696 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -257,10 +257,6 @@ export default {
       return !!Object.keys(this.translations).length;
     },
     message() {
-      if (this.contentType === 'input_csat') {
-        return this.$t('CONVERSATION.CSAT_REPLY_MESSAGE');
-      }
-
       // If the message is an email, emailMessageContent would be present
       // In that case, we would use letter package to render the email
       if (this.emailMessageContent && this.isIncoming) {
@@ -278,6 +274,11 @@ export default {
           },
         }
       );
+
+      if (this.contentType === 'input_csat') {
+        return this.$t('CONVERSATION.CSAT_REPLY_MESSAGE') + botMessageContent;
+      }
+
       return (
         this.formatMessage(
           this.data.content,

From 6d4b894f95d5ec510e9245a1afbb8a232a959c1e Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 24 Feb 2023 12:35:06 +0530
Subject: [PATCH 22/94] chore: Refactor chat list for RTL (#6524)

* chore: Refactor chat list for RTL

* chore: Modal

* fix: Show more button margin

* chore: Inbox name fix
---
 .../dashboard/assets/scss/_rtl.scss           | 26 ++++++-
 .../scss/widgets/_conversation-card.scss      | 70 +++++++++----------
 .../scss/widgets/_conversation-view.scss      |  2 +-
 .../components/widgets/InboxName.vue          |  2 +
 .../widgets/conversation/ConversationCard.vue |  1 -
 .../conversationCardComponents/CardLabels.vue |  2 +-
 .../conversation/contact/ConversationForm.vue |  4 --
 7 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 42c974f37..27c7d5a16 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -234,6 +234,7 @@
       }
 
       .show-more--button {
+        margin: unset;
         transform: rotate(180deg);
       }
     }
@@ -242,6 +243,14 @@
       text-align: right;
     }
 
+    // Card label
+    .label-container {
+      .label {
+        margin-left: var(--space-smaller);
+        margin-right: 0;
+      }
+    }
+
     // Secondary sidebar toggle button
     .toggle-sidebar {
       margin-left: 0;
@@ -404,14 +413,27 @@
     direction: initial;
   }
 
+  // Modal
+  .modal-container {
+    text-align: right;
+
+    .modal-footer {
+      button {
+        margin-left: 0;
+        margin-right: var(--space-small);
+      }
+    }
+  }
+
   // Other changes
 
   .account-selector--wrap {
     direction: initial;
   }
 
-  .inbox--name {
-    direction: initial;
+  .inbox--name .inbox--icon {
+    margin-left: var(--space-micro);
+    margin-right: 0;
   }
 
   .colorpicker--chrome {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
index 52a50afb6..858e86b28 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
@@ -13,18 +13,18 @@
   @include flex;
   @include flex-shrink;
   border-bottom: 1px solid transparent;
-  border-left: $space-micro solid transparent;
+  border-left: var(--space-micro) solid transparent;
   border-top: 1px solid transparent;
   cursor: pointer;
-  padding: 0 0 0 $space-normal;
+  padding: 0 var(--space-normal);
   position: relative;
 
   &.active {
     animation: left-shift-animation 0.25s $swift-ease-out-function;
-    background: $color-background;
-    border-bottom-color: $color-border-light;
-    border-left-color: $color-woot;
-    border-top-color: $color-border-light;
+    background: var(--color-background);
+    border-bottom-color: var(--color-border-light);
+    border-left-color: var(--color-woot);
+    border-top-color: var(--color-border-light);
 
     .conversation--details {
       border-top-color: transparent;
@@ -43,7 +43,7 @@
 
   &:last-child {
     .conversation--details {
-      border-bottom-color: $color-border-light;
+      border-bottom-color: var(--color-border-light);
     }
   }
 
@@ -51,33 +51,32 @@
     @include border-light-bottom;
     @include border-light-top;
     border-bottom-color: transparent;
-    margin: 0 0 0 $space-one;
-    padding: $space-slab 0;
+    padding: var(--space-slab) 0;
   }
 
   .conversation--user {
-    font-size: $font-size-small;
-    margin-bottom: 0;
+    font-size: var(--font-size-small);
+    margin: 0 var(--space-one);
     text-transform: capitalize;
 
     .label {
-      left: $space-micro;
-      max-width: $space-jumbo;
+      left: var(--space-one);
+      max-width: var(--space-jumbo);
       overflow: hidden;
       position: relative;
       text-overflow: ellipsis;
-      top: $space-micro;
+      top: var(--space-one);
       white-space: nowrap;
     }
   }
 
   .conversation--message {
-    color: $color-body;
-    font-size: $font-size-small;
-    font-weight: $font-weight-normal;
-    height: $space-medium;
-    line-height: $space-medium;
-    margin: 0;
+    color: var(--color-body);
+    font-size: var(--font-size-small);
+    font-weight: var(--font-weight-normal);
+    height: var(--space-medium);
+    line-height: var(--space-medium);
+    margin: 0 var(--space-one);
     max-width: 96%;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -89,32 +88,31 @@
     @include flex;
     flex-direction: column;
     position: absolute;
-    right: $space-normal;
-    top: $space-normal;
+    right: var(--space-normal);
+    top: var(--space-normal);
 
     .unread {
-      $unread-size: $space-normal;
       @include round-corner;
       @include light-shadow;
       background: darken($success-color, 3%);
-      color: $color-white;
+      color: var(--white);
       display: none;
-      font-size: $font-size-micro;
-      font-weight: $font-weight-black;
-      height: $unread-size;
-      line-height: $unread-size;
+      font-size: var(--font-size-micro);
+      font-weight: var(--font-weight-black);
+      height: var(--space-normal);
+      line-height: var(--space-normal);
       margin-left: auto;
-      margin-top: $space-smaller;
-      min-width: $unread-size;
-      padding: 0 $space-smaller;
+      margin-top: var(--space-smaller);
+      min-width: var(--space-normal);
+      padding: 0 var(--space-smaller);
       text-align: center;
     }
 
     .timestamp {
       color: $dark-gray;
-      font-size: $font-size-micro;
-      font-weight: $font-weight-normal;
-      line-height: $space-normal;
+      font-size: var(--font-size-micro);
+      font-weight: var(--font-weight-normal);
+      line-height: var(--space-normal);
       margin-left: auto;
     }
   }
@@ -125,11 +123,11 @@
     }
 
     .conversation--message {
-      font-weight: $font-weight-bold;
+      font-weight: var(--font-weight-bold);
     }
 
     .conversation--user {
-      font-weight: $font-weight-bold;
+      font-weight: var(--font-weight-bold);
     }
   }
 
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 8a8aab43a..41f3d2159 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -81,8 +81,8 @@
   }
 
   .conversations-list {
-    overflow-y: auto;
     flex: 1 1;
+    overflow-y: auto;
 
     @include breakpoint(large up) {
       @include scroll-on-hover;
diff --git a/app/javascript/dashboard/components/widgets/InboxName.vue b/app/javascript/dashboard/components/widgets/InboxName.vue
index cb0b9fb06..feb71803c 100644
--- a/app/javascript/dashboard/components/widgets/InboxName.vue
+++ b/app/javascript/dashboard/components/widgets/InboxName.vue
@@ -25,6 +25,7 @@ export default {
 </script>
 <style scoped>
 .inbox--name {
+  align-items: center;
   display: inline-flex;
   padding: var(--space-micro) 0;
   line-height: var(--space-slab);
@@ -32,6 +33,7 @@ export default {
   background: none;
   color: var(--s-500);
   font-size: var(--font-size-mini);
+  margin: 0 var(--space-one);
 }
 
 .inbox--icon {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 24227aeac..ff455c2fe 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -419,7 +419,6 @@ export default {
 .conversation--metadata {
   display: flex;
   justify-content: space-between;
-  padding-right: var(--space-normal);
 
   .label {
     background: none;
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
index e36b044e8..959ef3c0b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
@@ -97,7 +97,7 @@ export default {
 }
 
 .label-container {
-  margin-top: var(--space-micro);
+  margin: var(--space-micro) var(--space-one) 0;
 }
 
 .labels-wrap {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 8bfdf2d9a..26fbdd03d 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -350,10 +350,6 @@ export default {
   min-height: 8rem;
 }
 
-.modal-footer {
-  display: flex;
-  justify-content: flex-end;
-}
 .row.gutter-small {
   gap: var(--space-small);
 }

From 9fcb29484d737d22b0ced9a0c0adfd501dc65dba Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 24 Feb 2023 13:01:54 +0530
Subject: [PATCH 23/94] chore: Refactor sidebar related changes for RTL (#6519)

* Woot tabs

* Refactor sidebar related RTL

* Context menu

* chore: Minor fixes

* chore: Dropdown

* chore: Toggle switch

* chore: sidebar fixes

* fix: spacing issues and minor fixes

* chore: Space slab to small

---------

Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/assets/scss/_rtl.scss           | 55 +++++++++++++++----
 .../assets/scss/widgets/_conv-header.scss     |  2 +-
 .../assets/scss/widgets/_sidemenu.scss        | 25 +++++----
 .../dashboard/assets/scss/widgets/_tabs.scss  |  2 +-
 .../sidebarComponents/AccountContext.vue      |  3 +-
 .../layout/sidebarComponents/OptionsMenu.vue  |  6 +-
 .../sidebarComponents/SecondaryNavItem.vue    |  6 +-
 .../components/widgets/BackButton.vue         |  3 +-
 .../widgets/conversation/ConversationBox.vue  |  7 ++-
 .../conversation/contextMenu/menuItem.vue     |  8 +--
 .../contextMenu/menuItemWithSubmenu.vue       |  6 +-
 .../components/Header/ArticleHeader.vue       | 17 ++++--
 .../components/Header/EditArticleHeader.vue   |  3 +-
 .../components/HelpCenterLayout.vue           | 24 ++++----
 .../helpcenter/components/PortalSwitch.vue    |  6 +-
 .../pages/portals/ListAllPortals.vue          |  2 +-
 .../components/NotificationPanelList.vue      |  2 +-
 .../settings/inbox/WidgetBuilder.vue          |  4 +-
 .../components/ui/MultiselectDropdown.vue     |  1 -
 .../components/ui/dropdown/DropdownHeader.vue |  1 +
 20 files changed, 110 insertions(+), 73 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 27c7d5a16..95e774184 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -13,6 +13,10 @@
         padding: var(--space-smaller) var(--space-one) var(--space-smaller)
           var(--space-smaller);
       }
+
+      .status-items .button {
+        text-align: right;
+      }
     }
   }
 
@@ -23,10 +27,13 @@
       border-right: 0;
 
       .nested.vertical.menu {
-        align-items: flex-start;
+        .badge--icon {
+          margin-left: var(--space-smaller);
+          margin-right: unset;
+        }
 
-        li {
-          direction: initial;
+        .menu-label {
+          text-align: right;
         }
       }
 
@@ -74,7 +81,7 @@
   .settings-header {
     .header--icon {
       margin-left: 0;
-      margin-right: $space-small;
+      margin-right: var(--space-small);
     }
   }
 
@@ -95,13 +102,13 @@
   // Woot Tabs
   .tabs-title {
     &:first-child {
-      margin-left: $space-slab;
+      margin-left: var(--space-small);
       margin-right: unset;
     }
 
     &:last-child {
       margin-left: unset;
-      margin-right: $space-slab;
+      margin-right: var(--space-small);
     }
   }
 
@@ -133,7 +140,7 @@
 
         .user--profile__meta {
           margin-left: unset;
-          margin-right: $space-slab;
+          margin-right: var(--space-small);
         }
       }
 
@@ -315,7 +322,7 @@
 
     .notification-content--wrap {
       margin-left: 0;
-      margin-right: var(--space-slab);
+      margin-right: var(--space-small);
     }
   }
 
@@ -326,8 +333,9 @@
     }
   }
 
-  .header-left-wrap .page-title {
-    margin-right: var(--space-slab) !important;
+  // scss-lint:disable SelectorDepth
+  .container .header-wrap .header-left-wrap .header-left-wrap > .page-title {
+    margin-right: var(--space-small);
   }
 
   .portal-container .container {
@@ -408,6 +416,28 @@
     justify-content: flex-end;
   }
 
+  // Toggle switch
+  .toggle-button {
+    &.small {
+      span {
+        &.active {
+          transform: translate(var(--space-minus-small), var(--space-zero));
+        }
+      }
+    }
+
+    span {
+      --minus-space-one-point-five: -1.5rem;
+
+      &.active {
+        transform: translate(
+          var(--minus-space-one-point-five),
+          var(--space-zero)
+        );
+      }
+    }
+  }
+
   // Widget builder
   .widget-builder-container .widget-preview {
     direction: initial;
@@ -455,4 +485,9 @@
   .contact--form .input-group {
     direction: initial;
   }
+
+  // scss-lint:disable QualifyingElement
+  .dropdown-menu--header > span.title {
+    text-align: right;
+  }
 }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
index 0ed06c914..c352ff540 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
@@ -47,7 +47,7 @@ $resolve-button-width: 13.2rem;
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
-      margin-left: $space-slab;
+      margin-left: var(--space-small);
       min-width: 0;
     }
   }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
index 75cd8a513..d1c70aa9f 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
@@ -1,7 +1,7 @@
 .side-menu {
   i {
-    margin-right: $space-smaller;
-    min-width: $space-two;
+    margin-right: var(--space-smaller);
+    min-width: var(--space-two);
   }
 }
 
@@ -18,14 +18,14 @@
 
   .nested {
     a {
-      font-size: $font-size-small;
-      margin-bottom: $space-micro;
-      margin-top: $space-micro;
+      font-size: var(--font-size-small);
+      margin-bottom: var(--space-micro);
+      margin-top: var(--space-micro);
 
       .inbox-icon {
         display: inline-block;
-        margin-right: $space-micro;
-        min-width: $space-normal;
+        margin-right: var(--space-micro);
+        min-width: var(--space-normal);
         text-align: center;
       }
     }
@@ -38,7 +38,8 @@
   @include space-between-column;
   @include border-normal-top;
   flex-direction: column;
-  padding: $space-one $space-normal $space-one $space-one;
+  padding: var(--space-one) var(--space-normal) var(--space-one)
+    var(--space-one);
   position: relative;
 
   &:hover {
@@ -60,14 +61,18 @@
 .hamburger--menu {
   cursor: pointer;
   display: block;
-  margin-right: $space-normal;
+  margin-right: var(--space-normal);
 }
 
 .header--icon {
   display: block;
-  margin-right: $space-normal;
+  margin: 0 var(--space-normal);
 
   @media screen and (max-width: 1200px) {
     display: none;
   }
 }
+
+.header-title {
+  margin: 0 var(--space-small);
+}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
index 2f49945cd..ae55a1a41 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
@@ -47,7 +47,7 @@
 
 .tabs-title {
   flex-shrink: 0;
-  margin: 0 var(--space-slab);
+  margin: 0 var(--space-small);
 
   .badge {
     background: var(--color-background);
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
index 4eded3180..38761e408 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
@@ -26,6 +26,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
+
 export default {
   data() {
     return { showSwitchButton: false };
@@ -69,7 +70,7 @@ export default {
 }
 
 .switch-button {
-  margin-right: var(--space-small);
+  margin: 0 var(--space-small);
 }
 
 .account-context--switch-group {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
index 2dba51a5e..9b12f811a 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
@@ -3,7 +3,7 @@
     <div
       v-if="show"
       v-on-clickaway="onClickAway"
-      class="dropdown-pane"
+      class="options-menu dropdown-pane"
       :class="{ 'dropdown-pane--open': show }"
     >
       <availability-status />
@@ -150,10 +150,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.dropdown-pane {
+.options-menu.dropdown-pane {
   left: var(--space-slab);
   bottom: var(--space-larger);
-  min-width: 22rem;
+  min-width: var(--space-giga);
   top: unset;
   z-index: var(--z-index-low);
 }
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
index dc0888691..74323b082 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
@@ -331,11 +331,11 @@ export default {
 .beta {
   padding-right: var(--space-smaller) !important;
   padding-left: var(--space-smaller) !important;
-  margin-left: var(--space-smaller) !important;
+  margin: 0 var(--space-smaller) !important;
   display: inline-block;
   font-size: var(--font-size-micro);
   font-weight: var(--font-weight-medium);
-  line-height: 18px;
+  line-height: 14px;
   border: 1px solid transparent;
   border-radius: 2em;
   color: var(--g-800);
@@ -348,7 +348,7 @@ export default {
   color: var(--s-600);
   font-size: var(--font-size-micro);
   font-weight: var(--font-weight-bold);
-  margin-left: var(--space-smaller);
+  margin: 0 var(--space-smaller);
   padding: var(--space-zero) var(--space-smaller);
 }
 
diff --git a/app/javascript/dashboard/components/widgets/BackButton.vue b/app/javascript/dashboard/components/widgets/BackButton.vue
index 017c3f7e4..0610618b8 100644
--- a/app/javascript/dashboard/components/widgets/BackButton.vue
+++ b/app/javascript/dashboard/components/widgets/BackButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <button class="back-button" @click.capture="goBack">
+  <button class="settings back-button" @click.capture="goBack">
     <fluent-icon icon="chevron-left" />
     {{ buttonLabel || $t('GENERAL_SETTINGS.BACK') }}
   </button>
@@ -29,4 +29,3 @@ export default {
   },
 };
 </script>
-<style scoped></style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 0ed8c84d5..c4e4a80c4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="conversation-details-wrap"
-    :class="{ 'with-border-left': !isOnExpandedLayout }"
+    :class="{ 'with-border-right': !isOnExpandedLayout }"
   >
     <conversation-header
       v-if="currentChat.id"
@@ -144,8 +144,8 @@ export default {
   width: 100%;
   background: var(--color-background-light);
 
-  &.with-border-left {
-    border-left: 1px solid var(--color-border);
+  &.with-border-right {
+    border-right: 1px solid var(--color-border);
   }
 }
 
@@ -164,6 +164,7 @@ export default {
 }
 
 .conversation-sidebar-wrap {
+  border-right: 1px solid var(--color-border);
   height: auto;
   flex: 0 0;
   z-index: var(--z-index-low);
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
index 8cb02dc54..8fde2b36b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
@@ -51,15 +51,11 @@ export default {
   border-radius: var(--border-radius-small);
   overflow: hidden;
   .menu-label {
-    margin: 0;
+    margin: 0 var(--space-small);
     font-size: var(--font-size-mini);
     flex-shrink: 0;
   }
 
-  .menu-icon {
-    margin-right: var(--space-small);
-  }
-
   &:hover {
     background-color: var(--w-500);
     color: var(--white);
@@ -68,7 +64,6 @@ export default {
 
 .agent-thumbnail {
   margin-top: 0 !important;
-  margin-right: var(--space-small);
 }
 
 .label-pill {
@@ -77,6 +72,5 @@ export default {
   border-radius: var(--border-radius-rounded);
   border: 1px solid var(--s-50);
   flex-shrink: 0;
-  margin-right: var(--space-small);
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
index 04870ccc1..31a648cb4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
@@ -43,13 +43,9 @@ export default {
     align-items: center;
 
     .menu-label {
-      margin: 0;
+      margin: 0 var(--space-small);
       font-size: var(--font-size-mini);
     }
-
-    .menu-icon {
-      margin-right: var(--space-small);
-    }
   }
 
   .submenu {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
index 24ec9a42c..7d032dac8 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -2,8 +2,10 @@
   <div class="header--wrap">
     <div class="header-left--wrap">
       <woot-sidemenu-icon />
-      <h3 class="page-title">{{ headerTitle }}</h3>
-      <span class="text-block-title count-view">{{ `(${count})` }}</span>
+      <div class="header-title">
+        <h3 class="page-title">{{ headerTitle }}</h3>
+        <span class="text-block-title count-view">{{ `(${count})` }}</span>
+      </div>
     </div>
     <div class="header-right--wrap">
       <woot-button
@@ -160,8 +162,13 @@ export default {
   display: flex;
   align-items: center;
 
-  .page-title {
-    margin-bottom: 0;
+  .header-title {
+    display: flex;
+    align-items: center;
+    margin: 0 var(--space-smaller);
+    .page-title {
+      margin-bottom: 0;
+    }
   }
 }
 .header-right--wrap {
@@ -169,7 +176,7 @@ export default {
   align-items: center;
 }
 .count-view {
-  margin-left: var(--space-smaller);
+  margin: 0 var(--space-smaller);
 }
 .dropdown-pane--open {
   top: var(--space-larger);
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
index 5e8ec44d3..330086b78 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
@@ -6,6 +6,7 @@
         variant="clear"
         size="small"
         color-scheme="primary"
+        class="back-button"
         @click="onClickGoBack"
       >
         {{ backButtonLabel }}
@@ -42,7 +43,7 @@
         v-if="!isSidebarOpen"
         v-tooltip.top-end="$t('HELP_CENTER.EDIT_HEADER.OPEN_SIDEBAR')"
         icon="pane-open"
-        class-names="article--buttons"
+        class-names="article--buttons sidebar-button"
         variant="hollow"
         size="small"
         color-scheme="secondary"
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
index e99f3aac3..915cd8dfd 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
@@ -7,17 +7,19 @@
       @open-key-shortcut-modal="toggleKeyShortcutModal"
       @close-key-shortcut-modal="closeKeyShortcutModal"
     />
-    <help-center-sidebar
-      v-if="showHelpCenterSidebar"
-      :header-title="headerTitle"
-      :portal-slug="selectedPortalSlug"
-      :locale-slug="selectedLocaleInPortal"
-      :sub-title="localeName(selectedLocaleInPortal)"
-      :accessible-menu-items="accessibleMenuItems"
-      :additional-secondary-menu-items="additionalSecondaryMenuItems"
-      @open-popover="openPortalPopover"
-      @open-modal="onClickOpenAddCategoryModal"
-    />
+    <div class="secondary-sidebar">
+      <help-center-sidebar
+        v-if="showHelpCenterSidebar"
+        :header-title="headerTitle"
+        :portal-slug="selectedPortalSlug"
+        :locale-slug="selectedLocaleInPortal"
+        :sub-title="localeName(selectedLocaleInPortal)"
+        :accessible-menu-items="accessibleMenuItems"
+        :additional-secondary-menu-items="additionalSecondaryMenuItems"
+        @open-popover="openPortalPopover"
+        @open-modal="onClickOpenAddCategoryModal"
+      />
+    </div>
     <section class="app-content columns">
       <router-view />
       <command-bar />
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
index 30f3fb4ff..a6e24ad19 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
@@ -190,7 +190,7 @@ export default {
       .locale-content {
         display: flex;
         align-items: center;
-        justify-content: flex-start;
+        justify-content: space-between;
         width: 100%;
       }
 
@@ -233,10 +233,6 @@ export default {
       line-height: var(--space-normal);
       width: 100%;
     }
-
-    .meta {
-      flex-grow: 1;
-    }
   }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
index 857f210d5..f86da78ad 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
@@ -122,7 +122,7 @@ export default {
       display: flex;
       align-items: center;
       .page-title {
-        margin-bottom: 0;
+        margin: 0 var(--space-smaller) 0;
       }
     }
   }
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
index ff9b975a4..107fe6723 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
@@ -181,7 +181,7 @@ export default {
 .notification-type {
   font-size: var(--font-size-micro);
   padding: var(--space-micro) var(--space-smaller);
-  margin-left: var(--space-small);
+  margin: 0 var(--space-small);
   background: var(--s-50);
   border-radius: var(--border-radius-normal);
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
index 5bf4e8493..e6fa04fca 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="settings--content">
-    <div class="widget-builder-conatiner">
+    <div class="widget-builder-container">
       <div class="settings-container">
         <div class="settings-content">
           <form @submit.prevent="updateWidget">
@@ -420,7 +420,7 @@ export default {
 <style lang="scss" scoped>
 @import '~dashboard/assets/scss/woot';
 
-.widget-builder-conatiner {
+.widget-builder-container {
   display: flex;
   flex-direction: row;
   padding: var(--space-one);
diff --git a/app/javascript/shared/components/ui/MultiselectDropdown.vue b/app/javascript/shared/components/ui/MultiselectDropdown.vue
index 69265d9f1..ed2f2da4d 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdown.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdown.vue
@@ -140,7 +140,6 @@ export default {
 .selector-wrap {
   position: relative;
   width: 100%;
-  margin-right: var(--space-one);
   margin-bottom: var(--space-small);
 
   .selector-button {
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownHeader.vue b/app/javascript/shared/components/ui/dropdown/DropdownHeader.vue
index c3719ada4..c23e07df1 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownHeader.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownHeader.vue
@@ -17,6 +17,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .dropdown-menu--header {
+  display: inline-flex;
   list-style: none;
 
   .title {

From 26e760a2812dd544d3d601800a45588fce52a84f Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 24 Feb 2023 13:20:56 +0530
Subject: [PATCH 24/94] Add sender_name in the SMTP reply mails (#6528)

---
 app/mailers/conversation_reply_mailer.rb        |  9 ++++++++-
 app/mailers/conversation_reply_mailer_helper.rb |  2 +-
 config/locales/en.yml                           |  4 ++++
 spec/mailers/conversation_reply_mailer_spec.rb  | 11 +++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index f24bc46bb..5c44d622f 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -35,7 +35,6 @@ class ConversationReplyMailer < ApplicationMailer
     init_conversation_attributes(message.conversation)
     @message = message
     reply_mail_object = prepare_mail(true)
-
     message.update(source_id: reply_mail_object.message_id)
   end
 
@@ -115,6 +114,14 @@ class ConversationReplyMailer < ApplicationMailer
     end
   end
 
+  def channel_email_with_name
+    if @conversation.assignee.present?
+      I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: assignee_name, from_email: @channel.email)
+    else
+      I18n.t('conversations.reply.channel_email.header.reply_with_inbox_name', inbox_name: @inbox.name, from_email: @channel.email)
+    end
+  end
+
   def parse_email(email_string)
     Mail::Address.new(email_string).address
   end
diff --git a/app/mailers/conversation_reply_mailer_helper.rb b/app/mailers/conversation_reply_mailer_helper.rb
index 866fc2c85..9c006e8ed 100644
--- a/app/mailers/conversation_reply_mailer_helper.rb
+++ b/app/mailers/conversation_reply_mailer_helper.rb
@@ -72,7 +72,7 @@ module ConversationReplyMailerHelper
   end
 
   def email_from
-    email_microsoft_auth_enabled || email_smtp_enabled ? @channel.email : from_email_with_name
+    email_microsoft_auth_enabled || email_smtp_enabled ? channel_email_with_name : from_email_with_name
   end
 
   def email_reply_to
diff --git a/config/locales/en.yml b/config/locales/en.yml
index be8904057..55ad1dc18 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -147,6 +147,10 @@ en:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index bc89a0aa7..df0e34fd4 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -168,6 +168,17 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
         expect(mail.delivery_method.settings[:address]).to eq 'smtp.gmail.com'
         expect(mail.delivery_method.settings[:port]).to eq 587
       end
+
+      it 'renders assignee name in the from address' do
+        mail = described_class.email_reply(message)
+        expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from <#{smtp_email_channel.email}>"
+      end
+
+      it 'renders inbox name in the from address' do
+        conversation.update(assignee: nil)
+        mail = described_class.email_reply(message)
+        expect(mail['from'].value).to eq "#{smtp_email_channel.inbox.name} <#{smtp_email_channel.email}>"
+      end
     end
 
     context 'when smtp enabled for microsoft email channel' do

From c998c84bc090b75f282a7b0a95b11c158e65a614 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 24 Feb 2023 01:54:53 -0800
Subject: [PATCH 25/94] fix: Name missing when email is collected via email
 hook (#6530)

- The name is not updated when the email is updated via the email collect message. This PR fixes that.
---
 app/controllers/api/v1/widget/messages_controller.rb       | 2 +-
 spec/controllers/api/v1/widget/messages_controller_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index 7ff77be32..6287c94ee 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
       @message.update!(submitted_email: contact_email)
       ContactIdentifyAction.new(
         contact: @contact,
-        params: { email: contact_email }
+        params: { email: contact_email, name: contact_name }
       ).perform
     else
       @message.update!(message_update_params[:message])
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index 56485f9fc..06c0b46a9 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -138,6 +138,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
         message.reload
         expect(message.submitted_email).to eq(email)
         expect(message.conversation.contact.email).to eq(email)
+        expect(message.conversation.contact.name).to eq(email.split('@')[0])
       end
     end
 

From 76650c86cd38ef44602900c514c91cfb77cc8899 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 24 Feb 2023 17:15:11 +0530
Subject: [PATCH 26/94] chore: add `--force-exclusion` option (#6535)

The pre-commit hook would format event those files excluded in the config. This is because the files were passed as args instead of the linter running on the entire project. When this happens, the exclude is not respect.

The --force-exclusion flag instructs our machine overlords to force exlucde files specified in the configuration Exclude even if they are explicitly passed as arguments.
---
 .husky/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 9984ac506..adda426ad 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -5,7 +5,7 @@
 npx --no-install lint-staged
 
 # lint only staged ruby files
-git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop -a
+git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion -a
 
 # stage rubocop changes to files
 git diff --name-only --cached | xargs git add

From 92d0398744d760ecc6b332e9861545edb1316e63 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 24 Feb 2023 19:20:17 +0530
Subject: [PATCH 27/94] chore: Refactor conversation info panel for RTL (#6526)

* chore: Refactor conversation info panel for RTL

* chore: Adds comments

* chore: Settings header icon fix

* chore: Toggle layout switch

* chore: Border fix in chat list
---
 .../dashboard/assets/scss/_rtl.scss           | 14 ++++--
 .../scss/widgets/_conversation-view.scss      |  1 +
 .../assets/scss/widgets/_sidemenu.scss        |  2 +-
 .../widgets/conversation/ReplyBox.vue         | 31 +++++++++---
 .../conversationBulkActions/Index.vue         | 13 ++++-
 .../components/ContactDropdownItem.vue        |  5 +-
 .../modules/notes/components/ContactNote.vue  | 15 +++++-
 .../contacts/components/ContactInfoPanel.vue  | 23 +++------
 .../contacts/pages/ContactManageView.vue      |  6 ++-
 .../conversation/ContactConversations.vue     |  7 +++
 .../dashboard/conversation/ContactPanel.vue   | 18 ++-----
 .../conversation/contact/ContactInfo.vue      | 48 ++++++++++++++-----
 .../conversation/contact/ConversationForm.vue |  2 +-
 .../conversation/contact/SocialIcons.vue      |  2 +
 14 files changed, 123 insertions(+), 64 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 95e774184..2a6e6d692 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -80,8 +80,8 @@
   // Settings header
   .settings-header {
     .header--icon {
-      margin-left: 0;
-      margin-right: var(--space-small);
+      margin-left: var(--space-small);
+      margin-right: var(--space-smaller);
     }
   }
 
@@ -246,8 +246,14 @@
       }
     }
 
-    .search-header--wrap .search--input {
-      text-align: right;
+    .search-header--wrap {
+      .search--input {
+        text-align: right;
+      }
+
+      .layout-switch__container {
+        transform: rotate(180deg);
+      }
     }
 
     // Card label
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 41f3d2159..dc75ee29d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -67,6 +67,7 @@
 
 .conversations-list-wrap {
   @include flex;
+  border-right: 1px solid var(--s-50);
   flex-direction: column;
 
   .load-more-conversations {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
index d1c70aa9f..e1cdaa491 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
@@ -66,7 +66,7 @@
 
 .header--icon {
   display: block;
-  margin: 0 var(--space-normal);
+  margin: 0 var(--space-small) 0 var(--space-smaller);
 
   @media screen and (max-width: 1200px) {
     display: none;
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 416075d92..86cf292b9 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -27,7 +27,7 @@
       <emoji-input
         v-if="showEmojiPicker"
         v-on-clickaway="hideEmojiPicker"
-        :class="emojiDialogClassOnExpanedLayout"
+        :class="emojiDialogClassOnExpandedLayoutAndRTLView"
         :on-click="emojiOnClick"
       />
       <reply-email-head
@@ -179,6 +179,7 @@ import { trimContent, debounce } from '@chatwoot/utils';
 import wootConstants from 'dashboard/constants';
 import { isEditorHotKeyEnabled } from 'dashboard/mixins/uiSettings';
 import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
+import rtlMixin from 'shared/mixins/rtlMixin';
 
 const EmojiInput = () => import('shared/components/emoji/EmojiInput');
 
@@ -202,6 +203,7 @@ export default {
     uiSettingsMixin,
     alertMixin,
     messageFormatterMixin,
+    rtlMixin,
   ],
   props: {
     selectedTweet: {
@@ -422,10 +424,14 @@ export default {
       } = this.uiSettings;
       return conversationDisplayType !== CONDENSED;
     },
-    emojiDialogClassOnExpanedLayout() {
-      return this.isOnExpandedLayout || this.popoutReplyBox
-        ? 'emoji-dialog--expanded'
-        : '';
+    emojiDialogClassOnExpandedLayoutAndRTLView() {
+      if (this.isOnExpandedLayout || this.popoutReplyBox) {
+        return 'emoji-dialog--expanded';
+      }
+      if (this.isRTLView) {
+        return 'emoji-dialog--rtl';
+      }
+      return '';
     },
     replyToUserLength() {
       const selectedTweet = this.selectedTweet || {};
@@ -1098,7 +1104,7 @@ export default {
 
 .emoji-dialog {
   top: unset;
-  bottom: var(--space-normal);
+  bottom: -40px;
   left: -320px;
   right: unset;
 
@@ -1109,6 +1115,19 @@ export default {
     filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.08));
   }
 }
+
+.emoji-dialog--rtl {
+  left: unset;
+  right: -320px;
+  &::before {
+    left: var(--space-minus-normal);
+    transform: rotate(90deg);
+    right: 0;
+    bottom: var(--space-small);
+    filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.08));
+  }
+}
+
 .emoji-dialog--expanded {
   left: unset;
   bottom: var(--space-jumbo);
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index 12fb6210c..d10a0bb82 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -184,9 +184,18 @@ export default {
 </script>
 
 <style scoped lang="scss">
+// For RTL direction view
+.app-rtl--wrapper {
+  .bulk-action__actions {
+    ::v-deep .button--only-icon:last-child {
+      margin-right: var(--space-smaller);
+    }
+  }
+}
+
 .bulk-action__container {
   border-bottom: 1px solid var(--s-100);
-  padding: var(--space-normal) var(--space-one);
+  padding: var(--space-normal);
   position: relative;
 }
 
@@ -195,7 +204,7 @@ export default {
 
   span {
     font-size: var(--font-size-mini);
-    margin-left: var(--space-smaller);
+    margin: 0 var(--space-smaller);
   }
 
   input[type='checkbox'] {
diff --git a/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue b/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
index abe67471b..8e233638f 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
@@ -70,6 +70,7 @@ export default {
   flex-direction: column;
   flex-grow: 1;
   margin-left: var(--space-small);
+  margin-right: var(--space-small);
 }
 .option__body,
 .option__title {
@@ -93,10 +94,6 @@ export default {
   color: var(--s-700);
 }
 
-.email-icon-wrap {
-  margin-right: var(--space-normal);
-}
-
 .option__user-data .option__body {
   > .phone-icon-wrap,
   > .email-icon-wrap {
diff --git a/app/javascript/dashboard/modules/notes/components/ContactNote.vue b/app/javascript/dashboard/modules/notes/components/ContactNote.vue
index 17e847a8f..07caed5a8 100644
--- a/app/javascript/dashboard/modules/notes/components/ContactNote.vue
+++ b/app/javascript/dashboard/modules/notes/components/ContactNote.vue
@@ -11,7 +11,7 @@
         <div class="date-wrap">
           <span class="fw-medium"> {{ noteAuthorName }} </span>
           <span> {{ $t('NOTES.LIST.LABEL') }} </span>
-          <span class="fw-medium"> {{ readableTime }} </span>
+          <span class="fw-medium time-stamp"> {{ readableTime }} </span>
         </div>
       </div>
       <div class="actions">
@@ -105,6 +105,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// For RTL direction view
+.app-rtl--wrapper {
+  .note__content {
+    ::v-deep {
+      p {
+        unicode-bidi: plaintext;
+      }
+    }
+  }
+}
+
 .note__content {
   margin-top: var(--space-normal);
 }
@@ -120,7 +131,7 @@ export default {
     align-items: center;
 
     .date-wrap {
-      margin-left: var(--space-smaller);
+      margin: 0 var(--space-smaller);
       padding: var(--space-micro);
       color: var(--color-body);
     }
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index 3a3076e9c..266f9967c 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -3,13 +3,13 @@
     class="small-12 medium-3 bg-white contact--panel"
     :class="{ 'border-left': showAvatar }"
   >
-    <span v-if="showAvatar" class="close-button" @click="onClose">
-      <fluent-icon icon="dismiss" class="close-icon" />
-    </span>
     <contact-info
+      :show-close-button="showCloseButton"
       :show-avatar="showAvatar"
       :contact="contact"
+      close-icon-name="dismiss"
       @panel-close="onClose"
+      @toggle-panel="onClose"
     />
     <draggable
       :list="contactSidebarItems"
@@ -113,6 +113,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    showCloseButton: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -164,19 +168,6 @@ export default {
   }
 }
 
-.close-button {
-  position: absolute;
-  right: var(--space-normal);
-  top: 3.6rem;
-  font-size: var(--font-size-big);
-  color: var(--s-500);
-  z-index: 1;
-
-  .close-icon {
-    margin-right: var(--space-smaller);
-  }
-}
-
 .conversation--details {
   padding: 0 var(--space-normal);
 }
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
index 2c867859a..8ffa31484 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
@@ -29,7 +29,11 @@
       class="overflow-hidden column contact--dashboard-content"
     >
       <div class="row h-full">
-        <contact-info-panel :show-avatar="false" :contact="contact" />
+        <contact-info-panel
+          :show-close-button="false"
+          :show-avatar="false"
+          :contact="contact"
+        />
         <div class="small-12 medium-9 h-full">
           <woot-tabs :index="selectedTabIndex" @change="onClickTabChange">
             <woot-tabs-item
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
index 0ae756c8a..f2b15c42e 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
@@ -74,4 +74,11 @@ export default {
   margin-bottom: var(--space-normal);
   color: var(--b-500);
 }
+
+::v-deep .conversation {
+  padding-right: 0;
+  .conversation--details {
+    padding-left: var(--space-small);
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index ff43b1e22..cdbcecdb7 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -1,11 +1,10 @@
 <template>
   <div class="medium-3 bg-white contact--panel">
-    <woot-button
-      icon="chevron-right"
-      class="close-button clear secondary"
-      @click="onPanelToggle"
+    <contact-info
+      :contact="contact"
+      :channel-type="channelType"
+      @toggle-panel="onPanelToggle"
     />
-    <contact-info :contact="contact" :channel-type="channelType" />
     <draggable
       :list="conversationSidebarItems"
       :disabled="!dragEnabled"
@@ -295,15 +294,6 @@ export default {
   }
 }
 
-.close-button {
-  position: absolute;
-  right: $space-two;
-  top: $space-slab;
-  font-size: $font-size-default;
-  color: $color-heading;
-  z-index: 9989;
-}
-
 .conversation--labels {
   padding: $space-medium;
 
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 647ec8114..16660fbac 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -1,13 +1,21 @@
 <template>
   <div class="contact--profile">
     <div class="contact--info">
-      <thumbnail
-        v-if="showAvatar"
-        :src="contact.thumbnail"
-        size="56px"
-        :username="contact.name"
-        :status="contact.availability_status"
-      />
+      <div class="contact-info--header">
+        <thumbnail
+          v-if="showAvatar"
+          :src="contact.thumbnail"
+          size="56px"
+          :username="contact.name"
+          :status="contact.availability_status"
+        />
+        <woot-button
+          v-if="showCloseButton"
+          :icon="closeIconName"
+          class="clear secondary close-button--rtl"
+          @click="onPanelToggle"
+        />
+      </div>
 
       <div class="contact--details">
         <div v-if="showAvatar" class="contact--name-wrap">
@@ -194,6 +202,14 @@ export default {
       type: Boolean,
       default: true,
     },
+    showCloseButton: {
+      type: Boolean,
+      default: true,
+    },
+    closeIconName: {
+      type: String,
+      default: 'chevron-right',
+    },
   },
   data() {
     return {
@@ -244,6 +260,9 @@ export default {
     toggleEditModal() {
       this.showEditModal = !this.showEditModal;
     },
+    onPanelToggle() {
+      this.$emit('toggle-panel');
+    },
     toggleConversationModal() {
       this.showConversationModal = !this.showConversationModal;
     },
@@ -295,10 +314,6 @@ export default {
   position: relative;
   align-items: flex-start;
   padding: var(--space-normal);
-
-  .user-thumbnail-box {
-    margin-right: var(--space-normal);
-  }
 }
 
 .contact--details {
@@ -310,6 +325,12 @@ export default {
   text-align: left;
 }
 
+.contact-info--header {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: row;
+}
+
 .contact--name-wrap {
   display: flex;
   align-items: center;
@@ -319,7 +340,7 @@ export default {
 .contact--name {
   text-transform: capitalize;
   white-space: normal;
-  margin: 0 var(--space-smaller) 0 0;
+  margin: 0 var(--space-smaller) 0 var(--space-smaller);
 
   a {
     color: var(--color-body);
@@ -346,9 +367,10 @@ export default {
     margin-right: var(--space-small);
   }
 }
-.merege-summary--card {
+.merge-summary--card {
   padding: var(--space-normal);
 }
+
 .contact--bio {
   word-wrap: break-word;
 }
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 26fbdd03d..da7640806 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -335,7 +335,6 @@ export default {
   align-items: center;
   height: 3.9rem;
   background: var(--color-background-light);
-
   border: 1px solid var(--color-border);
   padding: var(--space-smaller) var(--space-small);
   border-radius: var(--border-radius-small);
@@ -343,6 +342,7 @@ export default {
   .contact-name {
     margin: 0;
     margin-left: var(--space-small);
+    margin-right: var(--space-small);
   }
 }
 
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue
index 644d1cbfb..7f05d3bd8 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/SocialIcons.vue
@@ -43,6 +43,8 @@ export default {
 
 <style scoped lang="scss">
 .social--icons {
+  align-items: flex-end;
+  display: flex;
   margin: var(--space-small) 0 var(--space-smaller);
 }
 

From 06ffaa90fc1b18b0943a499ae23417ab8660d963 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 25 Feb 2023 09:48:48 +0530
Subject: [PATCH 28/94] fix: bots included in time to response metrics (#6409)

* feat: ignore bots in avg_first_response_time

* feat: ignore bots in avg_first_response count

* feat: add bot handoff event

* feat: add handoff event listener and reporting event

* fix: ignore agent bot in first response

* refactor: calculate first_response with last handoff

* refactor: method defn order

* test: new reporting events

* feat: Revert "feat: ignore bots in avg_first_response count"

This reverts commit de1977c219a2e7a9180dd02272244fe3b3f7ce89.

* feat: Revert "feat: ignore bots in avg_first_response_time"

This reverts commit bb9171945d5e3b2f6015f4f96dd1b76b3efb6987.

* fix: business hour calculation for first_reply

* fix: event_start_time for first_response

* feat: add migration to recompute first_responses

* refactor: separate mute helpers for conversation

* refactor: rename migration

* refactor: migration script

* fix: migration typo

* fix: typo in query

* feat: update schema.rb

* Revert "feat: update schema.rb"

This reverts commit 353ef355f2d956dd219907bb66982dc90ca5d896.

* feat: update schema

* refactor: update events as a batch job

* fix: ignore the event if value is negative

* feat: don't create a new hand-off if it's already present

* refactor: break the action into smaller chunks

* refactor: update reporting listener spec

Handle the case to ensure extra bot handoffs are not created for a give conversation

* fix: import error

---------

Co-authored-by: Vishnu Narayanan <vishnu@chatwoot.com>
---
 app/helpers/reporting_event_helper.rb         |  9 +++
 ...t_response_time_in_reporting_events_job.rb | 61 +++++++++++++++++++
 app/listeners/reporting_event_listener.rb     | 30 ++++++++-
 .../concerns/conversation_mute_helpers.rb     | 28 +++++++++
 app/models/conversation.rb                    | 25 ++------
 app/models/message.rb                         |  9 ++-
 ...g_events_with_incorrect_first_responses.rb | 10 +++
 db/schema.rb                                  |  2 +-
 lib/events/types.rb                           |  1 +
 lib/integrations/bot_processor_service.rb     |  2 +-
 .../reporting_event_listener_spec.rb          | 51 ++++++++++++++++
 11 files changed, 200 insertions(+), 28 deletions(-)
 create mode 100644 app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
 create mode 100644 app/models/concerns/conversation_mute_helpers.rb
 create mode 100644 db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb

diff --git a/app/helpers/reporting_event_helper.rb b/app/helpers/reporting_event_helper.rb
index eee1af283..e08b5691c 100644
--- a/app/helpers/reporting_event_helper.rb
+++ b/app/helpers/reporting_event_helper.rb
@@ -17,6 +17,15 @@ module ReportingEventHelper
     from_in_inbox_timezone.working_time_until(to_in_inbox_timezone)
   end
 
+  def last_non_human_activity(conversation)
+    # check if a handoff event already exists
+    handoff_event = ReportingEvent.where(conversation_id: conversation.id, name: 'conversation_bot_handoff').last
+
+    # if a handoff exists, last non human activity is when the handoff ended,
+    # otherwise it's when the conversation was created
+    handoff_event&.event_end_time || conversation.created_at
+  end
+
   private
 
   def configure_working_hours(working_hours)
diff --git a/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb b/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
new file mode 100644
index 000000000..2e658708d
--- /dev/null
+++ b/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
@@ -0,0 +1,61 @@
+# Delete migration and spec after 2 consecutive releases.
+class Migration::UpdateFirstResponseTimeInReportingEventsJob < ApplicationJob
+  include ReportingEventHelper
+
+  queue_as :scheduled_jobs
+
+  def perform(account)
+    account.reporting_events.where(name: 'first_response', user_id: nil).each do |event|
+      conversation = event.conversation
+      next if conversation.nil?
+
+      update_event_data(event, conversation)
+    end
+  end
+
+  def update_event_data(event, conversation)
+    last_bot_reply = conversation.messages.where(sender_type: 'AgentBot').order(created_at: :asc).last
+    first_human_reply = conversation.messages.where(sender_type: 'User').order(created_at: :asc).first
+
+    # accomodate for campaign if required
+    # new_value = difference between the first_human_reply and the first_bot_reply if it exists or first_human_reply and created at
+    #
+    # conversation       bot                         conversation
+    # start              handoff                     resolved
+    # |                  |                           |
+    # |____|___|_________|____|_______|_____|________|
+    #      bot reply     ^    ^  human reply
+    #                    |    |
+    #                    |    |
+    #       last_bot_reply    first_human_reply
+    #
+    #
+    # bot handoff happens at the last_bot_reply created time
+    # the response time is the time between last bot reply created and the first human reply created
+
+    return if last_bot_reply.blank? || first_human_reply.blank?
+    return if last_bot_reply.created_at.to_i >= first_human_reply.created_at.to_i
+
+    # this means a bot replied existed, so we need to update the event_start_time
+    update_event_details(event, last_bot_reply, first_human_reply, conversation.inbox)
+  end
+
+  def update_event_details(event, last_bot_reply, first_human_reply, inbox)
+    # rubocop:disable Rails/SkipsModelValidations
+    event.update_columns(event_start_time: last_bot_reply.created_at,
+                         event_end_time: first_human_reply.created_at,
+                         value: calculate_event_value(last_bot_reply, first_human_reply),
+                         value_in_business_hours: calculate_event_value_in_business_hours(inbox, last_bot_reply,
+                                                                                          first_human_reply),
+                         user_id: first_human_reply.sender_id)
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def calculate_event_value(last_bot_reply, first_human_reply)
+    first_human_reply.created_at.to_i - last_bot_reply.created_at.to_i
+  end
+
+  def calculate_event_value_in_business_hours(inbox, last_bot_reply, first_human_reply)
+    business_hours(inbox, last_bot_reply.created_at, first_human_reply.created_at)
+  end
+end
diff --git a/app/listeners/reporting_event_listener.rb b/app/listeners/reporting_event_listener.rb
index e84d778bd..c0c54cc26 100644
--- a/app/listeners/reporting_event_listener.rb
+++ b/app/listeners/reporting_event_listener.rb
@@ -1,5 +1,6 @@
 class ReportingEventListener < BaseListener
   include ReportingEventHelper
+
   def conversation_resolved(event)
     conversation = extract_conversation_and_account(event)[0]
     time_to_resolve = conversation.updated_at.to_i - conversation.created_at.to_i
@@ -22,18 +23,18 @@ class ReportingEventListener < BaseListener
   def first_reply_created(event)
     message = extract_message_and_account(event)[0]
     conversation = message.conversation
-    first_response_time = message.created_at.to_i - conversation.created_at.to_i
+    first_response_time = message.created_at.to_i - last_non_human_activity(conversation).to_i
 
     reporting_event = ReportingEvent.new(
       name: 'first_response',
       value: first_response_time,
-      value_in_business_hours: business_hours(conversation.inbox, conversation.created_at,
+      value_in_business_hours: business_hours(conversation.inbox, last_non_human_activity(conversation),
                                               message.created_at),
       account_id: conversation.account_id,
       inbox_id: conversation.inbox_id,
       user_id: conversation.assignee_id,
       conversation_id: conversation.id,
-      event_start_time: conversation.created_at,
+      event_start_time: last_non_human_activity(conversation),
       event_end_time: message.created_at
     )
 
@@ -41,4 +42,27 @@ class ReportingEventListener < BaseListener
 
     reporting_event.save!
   end
+
+  def conversation_bot_handoff(event)
+    conversation = extract_conversation_and_account(event)[0]
+
+    # check if a conversation_bot_handoff event exists for this conversation
+    bot_handoff_event = ReportingEvent.find_by(conversation_id: conversation.id, name: 'conversation_bot_handoff')
+    return if bot_handoff_event.present?
+
+    time_to_handoff = conversation.updated_at.to_i - conversation.created_at.to_i
+
+    reporting_event = ReportingEvent.new(
+      name: 'conversation_bot_handoff',
+      value: time_to_handoff,
+      value_in_business_hours: business_hours(conversation.inbox, conversation.created_at, conversation.updated_at),
+      account_id: conversation.account_id,
+      inbox_id: conversation.inbox_id,
+      user_id: conversation.assignee_id,
+      conversation_id: conversation.id,
+      event_start_time: conversation.created_at,
+      event_end_time: conversation.updated_at
+    )
+    reporting_event.save!
+  end
 end
diff --git a/app/models/concerns/conversation_mute_helpers.rb b/app/models/concerns/conversation_mute_helpers.rb
new file mode 100644
index 000000000..525346869
--- /dev/null
+++ b/app/models/concerns/conversation_mute_helpers.rb
@@ -0,0 +1,28 @@
+module ConversationMuteHelpers
+  extend ActiveSupport::Concern
+
+  def mute!
+    resolved!
+    Redis::Alfred.setex(mute_key, 1, mute_period)
+    create_muted_message
+  end
+
+  def unmute!
+    Redis::Alfred.delete(mute_key)
+    create_unmuted_message
+  end
+
+  def muted?
+    Redis::Alfred.get(mute_key).present?
+  end
+
+  private
+
+  def mute_key
+    format(Redis::RedisKeys::CONVERSATION_MUTE_KEY, id: id)
+  end
+
+  def mute_period
+    6.hours
+  end
+end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 5d40ab513..119df82e9 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -48,6 +48,7 @@ class Conversation < ApplicationRecord
   include ActivityMessageHandler
   include UrlHelper
   include SortHandler
+  include ConversationMuteHelpers
 
   validates :account_id, presence: true
   validates :inbox_id, presence: true
@@ -142,19 +143,9 @@ class Conversation < ApplicationRecord
     save
   end
 
-  def mute!
-    resolved!
-    Redis::Alfred.setex(mute_key, 1, mute_period)
-    create_muted_message
-  end
-
-  def unmute!
-    Redis::Alfred.delete(mute_key)
-    create_unmuted_message
-  end
-
-  def muted?
-    Redis::Alfred.get(mute_key).present?
+  def bot_handoff!
+    open!
+    dispatcher_dispatch(CONVERSATION_BOT_HANDOFF)
   end
 
   def unread_messages
@@ -269,14 +260,6 @@ class Conversation < ApplicationRecord
     create_label_removed(user_name, previous_labels - current_labels)
   end
 
-  def mute_key
-    format(Redis::RedisKeys::CONVERSATION_MUTE_KEY, id: id)
-  end
-
-  def mute_period
-    6.hours
-  end
-
   def validate_referer_url
     return unless additional_attributes['referer']
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 6f11d2690..40f4af757 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -188,10 +188,15 @@ class Message < ApplicationRecord
     sender.update(last_activity_at: DateTime.now) if sender.is_a?(Contact)
   end
 
+  def first_human_response?
+    conversation.messages.outgoing
+                .where.not(sender_type: 'AgentBot')
+                .where("(additional_attributes->'campaign_id') is null").count == 1
+  end
+
   def dispatch_create_events
     Rails.configuration.dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
-
-    if outgoing? && conversation.messages.outgoing.where("(additional_attributes->'campaign_id') is null").count == 1
+    if outgoing? && first_human_response?
       Rails.configuration.dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
     end
   end
diff --git a/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb b/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb
new file mode 100644
index 000000000..437d1f5ba
--- /dev/null
+++ b/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb
@@ -0,0 +1,10 @@
+class UpdateReportingEventsWithIncorrectFirstResponses < ActiveRecord::Migration[6.1]
+  def change
+    ::Account.find_in_batches do |account_batch|
+      Rails.logger.info "Updated reporting events till #{account_batch.first.id}\n"
+      account_batch.each do |account|
+        Migration::UpdateFirstResponseTimeInReportingEventsJob.perform_later(account)
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 68284421c..bd4e95b2a 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: 2023_02_09_033203) do
+ActiveRecord::Schema.define(version: 2023_02_14_025901) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
diff --git a/lib/events/types.rb b/lib/events/types.rb
index b015cd3c5..85a77a6d3 100644
--- a/lib/events/types.rb
+++ b/lib/events/types.rb
@@ -16,6 +16,7 @@ module Events::Types
   CONVERSATION_CREATED = 'conversation.created'
   CONVERSATION_UPDATED = 'conversation.updated'
   CONVERSATION_READ = 'conversation.read'
+  CONVERSATION_BOT_HANDOFF = 'conversation.bot_handoff'
   # FIXME: deprecate the opened and resolved events in future in favor of status changed event.
   CONVERSATION_OPENED = 'conversation.opened'
   CONVERSATION_RESOLVED = 'conversation.resolved'
diff --git a/lib/integrations/bot_processor_service.rb b/lib/integrations/bot_processor_service.rb
index 42a416fdf..a76c3706d 100644
--- a/lib/integrations/bot_processor_service.rb
+++ b/lib/integrations/bot_processor_service.rb
@@ -55,7 +55,7 @@ class Integrations::BotProcessorService
   def process_action(message, action)
     case action
     when 'handoff'
-      message.conversation.open!
+      message.conversation.bot_handoff!
     when 'resolve'
       message.conversation.resolved!
     end
diff --git a/spec/listeners/reporting_event_listener_spec.rb b/spec/listeners/reporting_event_listener_spec.rb
index d3b6bd35d..2f0fc24bd 100644
--- a/spec/listeners/reporting_event_listener_spec.rb
+++ b/spec/listeners/reporting_event_listener_spec.rb
@@ -60,5 +60,56 @@ describe ReportingEventListener do
         expect(account.reporting_events.where(name: 'first_response')[0]['value_in_business_hours']).to be 144_000.0
       end
     end
+
+    # this ensures last_non_human_activity method accurately accounts for handoff events
+    context 'when last handoff event exists' do
+      let(:conversation_updated_at) { 20.seconds.from_now }
+      let(:human_message_created_at) { 62.seconds.from_now }
+      let(:new_conversation) { create(:conversation, account: account, inbox: inbox, assignee: user, updated_at: conversation_updated_at) }
+      let(:new_message) do
+        create(:message, message_type: 'outgoing', created_at: human_message_created_at, account: account, inbox: inbox,
+                         conversation: new_conversation)
+      end
+
+      it 'creates first_response event with handoff value' do
+        # this will create a handoff event
+        event = Events::Base.new('conversation.bot_handoff', conversation_updated_at, conversation: new_conversation)
+        listener.conversation_bot_handoff(event)
+
+        # create the first reply event
+        event = Events::Base.new('first.reply.created', human_message_created_at, message: new_message)
+        listener.first_reply_created(event)
+        expect(account.reporting_events.where(name: 'first_response')[0]['value']).to be 42.0
+      end
+    end
+  end
+
+  describe '#conversation_bot_handoff' do
+    it 'creates conversation_bot_handoff event only once' do
+      expect(account.reporting_events.where(name: 'conversation_bot_handoff').count).to be 0
+      event = Events::Base.new('conversation.bot_handoff', Time.zone.now, conversation: conversation)
+      listener.conversation_bot_handoff(event)
+      expect(account.reporting_events.where(name: 'conversation_bot_handoff').count).to be 1
+
+      # add extra handoff event for the same and ensure it's not created
+      event = Events::Base.new('conversation.bot_handoff', Time.zone.now, conversation: conversation)
+      listener.conversation_bot_handoff(event)
+      expect(account.reporting_events.where(name: 'conversation_bot_handoff').count).to be 1
+    end
+
+    context 'when business hours enabled for inbox' do
+      let(:created_at) { Time.zone.parse('March 20, 2022 00:00') }
+      let(:updated_at) { Time.zone.parse('March 26, 2022 23:59') }
+      let!(:new_inbox) { create(:inbox, working_hours_enabled: true, account: account) }
+      let!(:new_conversation) do
+        create(:conversation, created_at: created_at, updated_at: updated_at, account: account, inbox: new_inbox, assignee: user)
+      end
+
+      it 'creates conversation_bot_handoff event with business hour value' do
+        event = Events::Base.new('conversation.bot_handoff', Time.zone.now, conversation: new_conversation)
+        listener.conversation_bot_handoff(event)
+        expect(account.reporting_events.where(name: 'conversation_bot_handoff')[0]['value_in_business_hours']).to be 144_000.0
+      end
+    end
   end
 end

From 7d4e6d0257e1b5190de00b274ea5f760d9a24f08 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 27 Feb 2023 11:36:28 +0530
Subject: [PATCH 29/94] chore: Refactor tables in all screen for RTL (#6525)

* chore: Refactor tables in all screen for RTL

* Notification page footer

* Apply suggestions from code review

* chore: Minor ixes

* chore: Adds rtl comment

* chore: Code clean up for contact table

---------

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/assets/scss/_rtl.scss           |  4 +--
 .../assets/scss/plugins/_multiselect.scss     |  2 +-
 .../assets/scss/widgets/_woot-tables.scss     | 11 +++---
 .../components/widgets/TableFooter.vue        | 12 +++++--
 .../components/widgets/UserAvatarWithName.vue |  6 +---
 .../contacts/components/ContactsTable.vue     | 32 ++++++++---------
 .../components/NotificationPanel.vue          | 14 ++++++--
 .../settings/campaigns/CampaignsTable.vue     | 35 ++++++++++++-------
 .../settings/macros/MacrosTableRow.vue        |  7 ++--
 .../settings/reports/components/CsatTable.vue | 15 ++++----
 .../components/overview/AgentTable.vue        | 17 ++++-----
 11 files changed, 91 insertions(+), 64 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 2a6e6d692..1dd9e7a62 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -354,12 +354,12 @@
     }
 
     thead th {
-      padding-left: var(--space-one);
+      padding-left: var(--space-small);
       padding-right: 0;
     }
 
     tbody td {
-      padding-left: var(--space-one);
+      padding-left: var(--space-small);
       padding-right: 0;
     }
   }
diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index f1548fbea..4e534bc99 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -48,7 +48,7 @@
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        width: 100%;
+        width: fit-content;
       }
 
       p {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
index 915840786..5bbe1248d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
@@ -1,21 +1,22 @@
 table {
   border-spacing: 0;
-  font-size: $font-size-small;
+  font-size: var(--font-size-small);
 
   thead {
     th {
-      font-weight: $font-weight-bold;
+      font-weight: var(--font-weight-bold);
+      text-align: left;
       text-transform: uppercase;
     }
   }
 
   tbody {
     tr {
-      border-bottom: 1px solid $color-border-light;
+      border-bottom: 1px solid var(--color-border-light);
     }
 
     td {
-      padding: $space-one $space-small;
+      padding: var(--space-small);
     }
   }
 }
@@ -36,7 +37,7 @@ table {
 
   .agent-name {
     display: block;
-    font-weight: $font-weight-medium;
+    font-weight: var(--font-weight-medium);
     text-transform: capitalize;
   }
 
diff --git a/app/javascript/dashboard/components/widgets/TableFooter.vue b/app/javascript/dashboard/components/widgets/TableFooter.vue
index e28099bff..d1c02095b 100644
--- a/app/javascript/dashboard/components/widgets/TableFooter.vue
+++ b/app/javascript/dashboard/components/widgets/TableFooter.vue
@@ -24,7 +24,7 @@
           <fluent-icon
             icon="chevron-left"
             size="18"
-            class="margin-left-minus-slab"
+            :class="pageFooterIconClass"
           />
         </woot-button>
         <woot-button
@@ -65,7 +65,7 @@
           <fluent-icon
             icon="chevron-right"
             size="18"
-            class="margin-left-minus-slab"
+            :class="pageFooterIconClass"
           />
         </woot-button>
       </div>
@@ -74,8 +74,11 @@
 </template>
 
 <script>
+import rtlMixin from 'shared/mixins/rtlMixin';
+
 export default {
   components: {},
+  mixins: [rtlMixin],
   props: {
     currentPage: {
       type: Number,
@@ -91,6 +94,11 @@ export default {
     },
   },
   computed: {
+    pageFooterIconClass() {
+      return this.isRTLView
+        ? 'margin-right-minus-slab'
+        : 'margin-left-minus-slab';
+    },
     isFooterVisible() {
       return this.totalCount && !(this.firstIndex > this.totalCount);
     },
diff --git a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
index 932027887..9c0ebf87f 100644
--- a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
+++ b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
@@ -38,11 +38,7 @@ export default {
   text-align: left;
 
   .user-name {
-    margin: 0;
-    text-transform: capitalize;
-  }
-  .user-thumbnail-box {
-    margin-right: var(--space-small);
+    margin: 0 var(--space-small);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index 60ba4f4b6..edd090626 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -34,6 +34,7 @@ import Spinner from 'shared/components/Spinner.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
 import timeMixin from 'dashboard/mixins/time';
+import rtlMixin from 'shared/mixins/rtlMixin';
 import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
 
 export default {
@@ -42,7 +43,7 @@ export default {
     Spinner,
     VeTable,
   },
-  mixins: [clickaway, timeMixin],
+  mixins: [clickaway, timeMixin, rtlMixin],
   props: {
     contacts: {
       type: Array,
@@ -116,7 +117,7 @@ export default {
           key: 'name',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.NAME'),
           fixed: 'left',
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           sortBy: this.sortConfig.name || '',
           width: 300,
           renderBodyCell: ({ row }) => (
@@ -152,7 +153,7 @@ export default {
           field: 'email',
           key: 'email',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.EMAIL_ADDRESS'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           sortBy: this.sortConfig.email || '',
           width: 240,
           renderBodyCell: ({ row }) => {
@@ -176,27 +177,27 @@ export default {
           key: 'phone_number',
           sortBy: this.sortConfig.phone_number || '',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.PHONE_NUMBER'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
         },
         {
           field: 'company',
           key: 'company',
           sortBy: this.sortConfig.company_name || '',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.COMPANY'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
         },
         {
           field: 'city',
           key: 'city',
           sortBy: this.sortConfig.city || '',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.CITY'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
         },
         {
           field: 'country',
           key: 'country',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.COUNTRY'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           sortBy: this.sortConfig.country || '',
           renderBodyCell: ({ row }) => {
             if (row.country) {
@@ -213,7 +214,7 @@ export default {
           field: 'profiles',
           key: 'profiles',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.SOCIAL_PROFILES'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           renderBodyCell: ({ row }) => {
             const { profiles } = row;
 
@@ -244,21 +245,21 @@ export default {
           key: 'last_activity_at',
           sortBy: this.sortConfig.last_activity_at || '',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.LAST_ACTIVITY'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
         },
         {
           field: 'created_at',
           key: 'created_at',
           sortBy: this.sortConfig.created_at || '',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.CREATED_AT'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
         },
         {
           field: 'conversationsCount',
           key: 'conversationsCount',
           title: this.$t('CONTACTS_PAGE.LIST.TABLE_HEADER.CONVERSATIONS'),
           width: 150,
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
         },
       ];
     },
@@ -301,11 +302,10 @@ export default {
     text-align: left;
 
     .user-block {
-      min-width: 0;
-    }
-
-    .user-thumbnail-box {
-      margin-right: var(--space-small);
+      align-items: flex-start;
+      display: flex;
+      flex-direction: column;
+      margin: 0 var(--space-small);
     }
 
     .user-name {
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
index 7bed5ba88..7b5340a65 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
@@ -62,7 +62,7 @@
             <fluent-icon
               icon="chevron-left"
               size="16"
-              class="margin-left-minus-slab"
+              :class="notificationPanelFooterIconClass"
             />
           </woot-button>
           <woot-button
@@ -96,7 +96,7 @@
             <fluent-icon
               icon="chevron-right"
               size="16"
-              class="margin-left-minus-slab"
+              :class="notificationPanelFooterIconClass"
             />
           </woot-button>
         </div>
@@ -109,6 +109,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { mixin as clickaway } from 'vue-clickaway';
+import rtlMixin from 'shared/mixins/rtlMixin';
 
 import NotificationPanelList from './NotificationPanelList';
 
@@ -116,7 +117,7 @@ export default {
   components: {
     NotificationPanelList,
   },
-  mixins: [clickaway],
+  mixins: [clickaway, rtlMixin],
   data() {
     return {
       pageSize: 15,
@@ -129,6 +130,11 @@ export default {
       records: 'notifications/getNotifications',
       uiFlags: 'notifications/getUIFlags',
     }),
+    notificationPanelFooterIconClass() {
+      return this.isRTLView
+        ? 'margin-right-minus-slab'
+        : 'margin-left-minus-slab';
+    },
     totalUnreadNotifications() {
       return this.meta.unreadCount;
     },
@@ -249,6 +255,7 @@ export default {
   left: var(--space-jumbo);
   margin: var(--space-small);
 }
+
 .header-wrap {
   flex-direction: row;
   align-items: center;
@@ -272,6 +279,7 @@ export default {
     font-size: var(--font-size-micro);
     font-weight: var(--font-weight-bold);
     margin-left: var(--space-smaller);
+    margin-right: var(--space-smaller);
   }
 
   .action-button {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
index 993376f12..bd7b43aec 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignsTable.vue
@@ -26,6 +26,7 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import UserAvatarWithName from 'dashboard/components/widgets/UserAvatarWithName';
 import campaignMixin from 'shared/mixins/campaignMixin';
 import timeMixin from 'dashboard/mixins/time';
+import rtlMixin from 'shared/mixins/rtlMixin';
 import InboxName from 'dashboard/components/widgets/InboxName';
 
 export default {
@@ -35,7 +36,13 @@ export default {
     VeTable,
   },
 
-  mixins: [clickaway, timeMixin, campaignMixin, messageFormatterMixin],
+  mixins: [
+    clickaway,
+    timeMixin,
+    campaignMixin,
+    messageFormatterMixin,
+    rtlMixin,
+  ],
 
   props: {
     campaigns: {
@@ -98,7 +105,7 @@ export default {
           key: 'title',
           title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.TITLE'),
           fixed: 'left',
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           renderBodyCell: ({ row }) => (
             <div class="row--title-block">
               <h6 class="sub-block-title title text-truncate">{row.title}</h6>
@@ -110,7 +117,7 @@ export default {
           field: 'message',
           key: 'message',
           title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.MESSAGE'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 350,
           renderBodyCell: ({ row }) => {
             if (row.message) {
@@ -129,7 +136,7 @@ export default {
           field: 'inbox',
           key: 'inbox',
           title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.INBOX'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           renderBodyCell: ({ row }) => {
             return <InboxName inbox={row.inbox} />;
           },
@@ -142,7 +149,7 @@ export default {
             field: 'enabled',
             key: 'enabled',
             title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.STATUS'),
-            align: 'left',
+            align: this.isRTLView ? 'right' : 'left',
             renderBodyCell: ({ row }) => {
               const labelText = row.enabled
                 ? this.$t('CAMPAIGN.LIST.STATUS.ENABLED')
@@ -155,7 +162,7 @@ export default {
             field: 'sender',
             key: 'sender',
             title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.SENDER'),
-            align: 'left',
+            align: this.isRTLView ? 'right' : 'left',
             renderBodyCell: ({ row }) => {
               if (row.sender) return <UserAvatarWithName user={row.sender} />;
               return this.$t('CAMPAIGN.LIST.SENDER.BOT');
@@ -165,7 +172,7 @@ export default {
             field: 'url',
             key: 'url',
             title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.URL'),
-            align: 'left',
+            align: this.isRTLView ? 'right' : 'left',
             renderBodyCell: ({ row }) => (
               <div class="text-truncate">
                 <a
@@ -183,14 +190,14 @@ export default {
             field: 'timeOnPage',
             key: 'timeOnPage',
             title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.TIME_ON_PAGE'),
-            align: 'left',
+            align: this.isRTLView ? 'right' : 'left',
           },
 
           {
             field: 'buttons',
             key: 'buttons',
             title: '',
-            align: 'left',
+            align: this.isRTLView ? 'right' : 'left',
             renderBodyCell: row => (
               <div class="button-wrapper">
                 <WootButton
@@ -221,7 +228,7 @@ export default {
           field: 'campaign_status',
           key: 'campaign_status',
           title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.STATUS'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           renderBodyCell: ({ row }) => {
             const labelText =
               row.campaign_status === 'completed'
@@ -236,13 +243,13 @@ export default {
           field: 'scheduledAt',
           key: 'scheduledAt',
           title: this.$t('CAMPAIGN.LIST.TABLE_HEADER.SCHEDULED_AT'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
         },
         {
           field: 'buttons',
           key: 'buttons',
           title: '',
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           renderBodyCell: row => (
             <div class="button-wrapper">
               <WootButton
@@ -272,6 +279,10 @@ export default {
     }
     tbody.ve-table-body .ve-table-body-tr .ve-table-body-td {
       padding: var(--space-slab) var(--space-two);
+
+      .inbox--name {
+        margin: 0;
+      }
     }
   }
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
index 29419db85..648388e98 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacrosTableRow.vue
@@ -4,13 +4,13 @@
     <td>
       <div class="avatar-container">
         <thumbnail :username="macro.created_by.name" size="24px" />
-        <span class="ml-2">{{ macro.created_by.name }}</span>
+        <span>{{ macro.created_by.name }}</span>
       </div>
     </td>
     <td>
       <div class="avatar-container">
         <thumbnail :username="macro.updated_by.name" size="24px" />
-        <span class="ml-2">{{ macro.updated_by.name }}</span>
+        <span>{{ macro.updated_by.name }}</span>
       </div>
     </td>
     <td>{{ visibilityLabel }}</td>
@@ -68,7 +68,8 @@ export default {
   align-items: center;
 
   span {
-    margin-left: var(--space-one);
+    margin-left: var(--space-small);
+    margin-right: var(--space-small);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
index 2ced3c62a..1f1a0da94 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatTable.vue
@@ -26,13 +26,14 @@ import UserAvatarWithName from 'dashboard/components/widgets/UserAvatarWithName'
 import { CSAT_RATINGS } from 'shared/constants/messages';
 import { mapGetters } from 'vuex';
 import timeMixin from 'dashboard/mixins/time';
+import rtlMixin from 'shared/mixins/rtlMixin';
 
 export default {
   components: {
     VeTable,
     VePagination,
   },
-  mixins: [timeMixin],
+  mixins: [timeMixin, rtlMixin],
   props: {
     pageIndex: {
       type: Number,
@@ -51,7 +52,7 @@ export default {
           field: 'contact',
           key: 'contact',
           title: this.$t('CSAT_REPORTS.TABLE.HEADER.CONTACT_NAME'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 200,
           renderBodyCell: ({ row }) => {
             if (row.contact) {
@@ -64,7 +65,7 @@ export default {
           field: 'assignedAgent',
           key: 'assignedAgent',
           title: this.$t('CSAT_REPORTS.TABLE.HEADER.AGENT_NAME'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 200,
           renderBodyCell: ({ row }) => {
             if (row.assignedAgent) {
@@ -94,14 +95,14 @@ export default {
           field: 'feedbackText',
           key: 'feedbackText',
           title: this.$t('CSAT_REPORTS.TABLE.HEADER.FEEDBACK_TEXT'),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 400,
         },
         {
-          field: 'converstionId',
-          key: 'converstionId',
+          field: 'conversationId',
+          key: 'conversationId',
           title: '',
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 100,
           renderBodyCell: ({ row }) => {
             const routerParams = {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
index 4ad35288a..8f4866ddb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
@@ -32,6 +32,7 @@
 import { VeTable, VePagination } from 'vue-easytable';
 import Spinner from 'shared/components/Spinner.vue';
 import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
+import rtlMixin from 'shared/mixins/rtlMixin';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 
 export default {
@@ -42,6 +43,7 @@ export default {
     VeTable,
     VePagination,
   },
+  mixins: [rtlMixin],
   props: {
     agents: {
       type: Array,
@@ -83,7 +85,7 @@ export default {
             'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.AGENT'
           ),
           fixed: 'left',
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 25,
           renderBodyCell: ({ row }) => (
             <div class="row-user-block">
@@ -106,7 +108,7 @@ export default {
           title: this.$t(
             'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.OPEN'
           ),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 10,
         },
         {
@@ -115,7 +117,7 @@ export default {
           title: this.$t(
             'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.UNATTENDED'
           ),
-          align: 'left',
+          align: this.isRTLView ? 'right' : 'left',
           width: 10,
         },
       ];
@@ -165,22 +167,21 @@ export default {
     text-align: left;
 
     .user-block {
+      align-items: flex-start;
       display: flex;
       flex-direction: column;
       min-width: 0;
+      margin: 0 var(--space-small);
+
       .title {
         font-size: var(--font-size-small);
         margin: var(--zero);
-        line-height: 1;
+        line-height: 1.2;
       }
       .sub-title {
         font-size: var(--font-size-mini);
       }
     }
-
-    .user-thumbnail-box {
-      margin-right: var(--space-small);
-    }
   }
 
   .table-pagination {

From bfb445186d215065ede0aa0b4e5156a3cea263ed Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 27 Feb 2023 11:50:21 +0530
Subject: [PATCH 30/94] chore: Refactor reports css for RTL (#6537)

---
 .../assets/scss/widgets/_report.scss          | 36 +++++++++----------
 .../assets/scss/widgets/_reports.scss         |  3 +-
 .../components/widgets/UserAvatarWithName.vue |  2 +-
 .../reports/components/CsatMetricCard.vue     |  5 ++-
 .../reports/components/CsatMetrics.vue        |  2 +-
 5 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_report.scss b/app/javascript/dashboard/assets/scss/widgets/_report.scss
index 6caf2cac7..e9ce5d0bd 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_report.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_report.scss
@@ -3,23 +3,23 @@
 
   cursor: pointer;
   margin: 0;
-  padding: $space-normal $space-small $space-normal $space-two;
+  padding: var(--space-normal);
 
   &.active {
-    @include custom-border-top(3px, $color-woot);
+    @include custom-border-top(3px, var(--color-woot));
     @include background-white;
     .heading,
     .metric {
-      color: $color-woot;
+      color: var(--color-woot);
     }
   }
 
   .heading {
     align-items: center;
-    color: $color-heading;
+    color: var(--color-heading);
     display: flex;
-    font-size: $font-size-small;
-    font-weight: $font-weight-bold;
+    font-size: var(--font-size-small);
+    font-weight: var(--font-weight-bold);
     margin: 0;
   }
 
@@ -29,19 +29,19 @@
   }
 
   .metric-wrap {
-    align-items: baseline;
+    align-items: center;
     display: flex;
   }
 
   .metric {
-    font-size: $font-size-big;
-    font-weight: $font-weight-feather;
-    margin-top: $space-smaller;
+    font-size: var(--font-size-big);
+    font-weight: var(--font-weight-feather);
+    margin-top: var(--space-smaller);
   }
 
   .metric-trend {
-    font-size: $font-size-small;
-    margin-left: $space-small;
+    font-size: var(--font-size-small);
+    margin: 0 var(--space-small);
   }
 
   .metric-up {
@@ -53,7 +53,7 @@
   }
 
   .desc {
-    font-size: $font-size-small;
+    font-size: var(--font-size-small);
     margin: 0;
     text-transform: capitalize;
   }
@@ -62,8 +62,8 @@
 .report-bar {
   @include background-white;
   @include border-light;
-  margin: -1px $zero;
-  padding: $space-small $space-medium;
+  margin: var(--space-minus-micro) 0;
+  padding: var(--space-small) var(--space-medium);
 
   .chart-container {
     @include flex;
@@ -76,12 +76,12 @@
 
     .empty-state {
       color: $color-gray;
-      font-size: $font-size-default;
-      margin: $space-jumbo;
+      font-size: var(--font-size-default);
+      margin: var(--space-jumbo);
     }
 
     .business-hours {
-      margin: $space-normal;
+      margin: var(--space-normal);
       text-align: center;
     }
   }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reports.scss b/app/javascript/dashboard/assets/scss/widgets/_reports.scss
index d55dbd5a3..c848bc0c8 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reports.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reports.scss
@@ -25,8 +25,7 @@
 .business-hours {
   align-items: center;
   display: flex;
-  justify-content: end;
-  margin-bottom: var(--space-normal);
+  justify-content: flex-start;
   margin-left: auto;
   padding-right: var(--space-normal);
 }
diff --git a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
index 9c0ebf87f..35f6de9d6 100644
--- a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
+++ b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue
@@ -6,7 +6,7 @@
       :username="user.name"
       :status="user.availability_status"
     />
-    <h6 class="text-block-title text-truncate text-capitalize">
+    <h6 class="text-block-title user-name text-truncate text-capitalize">
       {{ user.name }}
     </h6>
   </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
index d24e95216..1846d1549 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
@@ -35,8 +35,7 @@ export default {
 <style lang="scss" scoped>
 .csat--metric-card {
   margin: 0;
-  padding: var(--space-normal) var(--space-small) var(--space-normal)
-    var(--space-two);
+  padding: var(--space-normal);
 
   .heading {
     align-items: center;
@@ -57,6 +56,6 @@ export default {
 
 .csat--icon {
   color: var(--b-400);
-  margin-left: var(--space-micro);
+  margin: 0 var(--space-micro);
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index 227b619d2..9144e95c1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -103,6 +103,6 @@ export default {
 }
 
 .emoji--distribution-key {
-  margin-right: var(--space-micro);
+  margin: 0 var(--space-micro);
 }
 </style>

From eb55ff5c9b514b180d85e6d93460267dd632b095 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:03:40 +0530
Subject: [PATCH 31/94] chore: Adds the ability to automatically initialize the
 RTL direction (#6531)

---
 app/javascript/dashboard/App.vue         | 1 +
 app/javascript/shared/mixins/rtlMixin.js | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index ef4bd2eb3..0d0a6906c 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -104,6 +104,7 @@ export default {
       } = this.getAccount(this.currentAccountId);
       const { pubsub_token: pubsubToken } = this.currentUser || {};
       this.setLocale(locale);
+      this.updateRTLDirectionView(locale);
       this.latestChatwootVersion = latestChatwootVersion;
       vueActionCable.init(pubsubToken);
     },
diff --git a/app/javascript/shared/mixins/rtlMixin.js b/app/javascript/shared/mixins/rtlMixin.js
index 6267c9c16..6ea906d63 100644
--- a/app/javascript/shared/mixins/rtlMixin.js
+++ b/app/javascript/shared/mixins/rtlMixin.js
@@ -1,4 +1,5 @@
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import { getLanguageDirection } from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
 
 export default {
   mixins: [uiSettingsMixin],
@@ -8,4 +9,12 @@ export default {
       return isRTLView;
     },
   },
+  methods: {
+    updateRTLDirectionView(locale) {
+      const isRTLSupported = getLanguageDirection(locale);
+      this.updateUISettings({
+        rtl_view: isRTLSupported,
+      });
+    },
+  },
 };

From b76fda53a2d261fcdedb161d91465e729085cc16 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 27 Feb 2023 18:33:11 +0530
Subject: [PATCH 32/94] fix: Email subject automation issue (#6533)

---
 lib/filters/filter_keys.json                  |  9 +++-
 .../automation_rule_listener_spec.rb          | 47 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/lib/filters/filter_keys.json b/lib/filters/filter_keys.json
index 7d1ed4842..939520ec8 100644
--- a/lib/filters/filter_keys.json
+++ b/lib/filters/filter_keys.json
@@ -90,6 +90,13 @@
       "data_type": "date",
       "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
       "attribute_type": "date_attributes"
+    },
+    "mail_subject": {
+      "attribute_name": "Email Subject",
+      "input_type": "text",
+      "data_type": "text",
+      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain"],
+      "attribute_type": "additional_attributes"
     }
   },
   "contacts": {
@@ -184,7 +191,7 @@
       "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"  
+      "attribute_type": "standard"
     }
   }
 }
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 0517f99d6..73bc8a80b 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -816,4 +816,51 @@ describe AutomationRuleListener do
       expect(new_conversation.messages.last.content_attributes).to eq({ 'automation_rule_id' => new_automation_rule.id })
     end
   end
+
+  describe '#conversation_created for email inbox' do
+    let!(:new_account) { create(:account) }
+
+    before do
+      smtp_email_channel = create(:channel_email, smtp_enabled: true, smtp_address: 'smtp.gmail.com', smtp_port: 587, smtp_login: 'smtp@gmail.com',
+                                                  smtp_password: 'password', smtp_domain: 'smtp.gmail.com', account: new_account)
+      email_inbox = smtp_email_channel.inbox
+      email_conversation = create(:conversation, inbox: email_inbox, account: new_account,
+                                                 additional_attributes: { 'source' => 'email', 'mail_subject' => 'New conversation test email' })
+      new_automation_rule = create(:automation_rule, account: new_account, name: 'Test Automation Rule - 1')
+
+      create(:message, account: new_account, conversation: email_conversation, message_type: 'incoming')
+
+      new_automation_rule.update!(
+        event_name: 'conversation_created',
+        conditions: [{ attribute_key: 'mail_subject', filter_operator: 'contains', values: ['test'], query_operator: nil }.with_indifferent_access],
+        actions: [{ 'action_name' => 'send_message', 'action_params' => ['Send this message. - 1'] }]
+      )
+    end
+
+    context 'when mail_subject condition matches' do
+      it 'triggers automation and send message' do
+        email_conversation = new_account.conversations.last
+        event = Events::Base.new('conversation_created', Time.zone.now, { conversation: email_conversation })
+
+        listener.conversation_created(event)
+
+        expect(email_conversation.messages.count).to eq(2)
+        expect(email_conversation.messages.last.content).to eq('Send this message. - 1')
+      end
+    end
+
+    context 'when mail_subject condition does not match' do
+      it 'does not triggers automation' do
+        email_conversation = new_account.conversations.last
+        email_conversation.update!(additional_attributes: { 'source' => 'email', 'mail_subject' => 'New conversation email' })
+        event = Events::Base.new('conversation_created', Time.zone.now, { conversation: email_conversation.reload })
+
+        listener.conversation_created(event)
+
+        expect(email_conversation.messages.count).to eq(1)
+        expect(email_conversation.messages.last.content).not_to eq('Send this message. - 1')
+        expect(email_conversation.messages.last.content).to eq('Incoming Message')
+      end
+    end
+  end
 end

From ce807d3251426e967e878d51c602a8856e3d88d0 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 27 Feb 2023 20:22:07 +0530
Subject: [PATCH 33/94] fix: Condition based backend validation (#6554)

---
 app/models/automation_rule.rb       | 8 ++++++++
 spec/models/automation_rule_spec.rb | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 7e415231a..8af2a4aab 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -25,6 +25,7 @@ class AutomationRule < ApplicationRecord
 
   validate :json_conditions_format
   validate :json_actions_format
+  validate :query_operator_presence
   validates :account_id, presence: true
 
   scope :active, -> { where(active: true) }
@@ -67,4 +68,11 @@ class AutomationRule < ApplicationRecord
 
     errors.add(:actions, "Automation actions #{actions.join(',')} not supported.") if actions.any?
   end
+
+  def query_operator_presence
+    return if conditions.blank?
+
+    operators = conditions.select { |obj, _| obj['query_operator'].nil? }
+    errors.add(:conditions, 'Automation conditions should have query operator.') if operators.length > 1
+  end
 end
diff --git a/spec/models/automation_rule_spec.rb b/spec/models/automation_rule_spec.rb
index bf7729c5c..efcae76fd 100644
--- a/spec/models/automation_rule_spec.rb
+++ b/spec/models/automation_rule_spec.rb
@@ -48,5 +48,12 @@ RSpec.describe AutomationRule, type: :model do
       rule = FactoryBot.build(:automation_rule, params)
       expect(rule.valid?).to be true
     end
+
+    it 'returns invalid record' do
+      params[:conditions][0].delete('query_operator')
+      rule = FactoryBot.build(:automation_rule, params)
+      expect(rule.valid?).to be false
+      expect(rule.errors.messages[:conditions]).to eq(['Automation conditions should have query operator.'])
+    end
   end
 end

From b141fc1289e86c6170d777467f90a06836e58310 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 27 Feb 2023 09:12:14 -0800
Subject: [PATCH 34/94] fix: Fetch categories by locale (#6557)

---
 .../public/api/v1/portals/articles_controller.rb  | 15 ++++++++++++---
 .../api/v1/portals/articles_controller_spec.rb    |  8 +++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/controllers/public/api/v1/portals/articles_controller.rb b/app/controllers/public/api/v1/portals/articles_controller.rb
index 22ffbbf7a..a2d518d8e 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -15,23 +15,32 @@ class Public::Api::V1::Portals::ArticlesController < PublicController
   private
 
   def set_article
-    @article = @category.articles.find(params[:id])
+    @article = @category.articles.find(permitted_params[:id])
     @article.increment_view_count
     @parsed_content = render_article_content(@article.content)
   end
 
   def set_category
-    @category = @portal.categories.find_by!(slug: params[:category_slug]) if params[:category_slug].present?
+    return if permitted_params[:category_slug].blank?
+
+    @category = @portal.categories.find_by!(
+      slug: permitted_params[:category_slug],
+      locale: permitted_params[:locale]
+    )
   end
 
   def portal
-    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
+    @portal ||= Portal.find_by!(slug: permitted_params[:slug], archived: false)
   end
 
   def list_params
     params.permit(:query)
   end
 
+  def permitted_params
+    params.permit(:slug, :category_slug, :locale, :id)
+  end
+
   def render_article_content(content)
     # rubocop:disable Rails/OutputSafety
     CommonMarker.render_html(content).html_safe
diff --git a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
index 0f074ea29..a51b7365e 100644
--- a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'Public Articles API', type: :request do
   let(:agent) { create(:user, account: account, role: :agent) }
   let!(:portal) { create(:portal, slug: 'test-portal', config: { allowed_locales: %w[en es] }, custom_domain: 'www.example.com') }
   let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id, locale: 'en', slug: 'category_slug') }
-  let!(:category_2) { create(:category, name: 'category', portal: portal, account_id: account.id, locale: 'es', slug: 'category_2_slug') }
+  let!(:category_2) { create(:category, name: 'category', portal: portal, account_id: account.id, locale: 'es', slug: 'category_slug') }
   let!(:article) { create(:article, category: category, portal: portal, account_id: account.id, author_id: agent.id) }
 
   before do
@@ -44,5 +44,11 @@ RSpec.describe 'Public Articles API', type: :request do
       expect(response).to have_http_status(:success)
       expect(article.reload.views).to eq 1
     end
+
+    it 'returns the article with the id with a different locale' do
+      article_in_locale = create(:article, category: category_2, portal: portal, account_id: account.id, author_id: agent.id)
+      get "/hc/#{portal.slug}/#{category_2.locale}/#{category_2.slug}/#{article_in_locale.id}"
+      expect(response).to have_http_status(:success)
+    end
   end
 end

From 69a1c4527f59fabd311fbe2c50409b7cb40b4565 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 27 Feb 2023 17:45:57 -0800
Subject: [PATCH 35/94] fix: Fix i18n issues with help center (#6559)

---
 .../api/v1/portals/articles_controller.rb     |  4 +-
 .../public/api/v1/portals/base_controller.rb  | 22 ++++++
 .../api/v1/portals/categories_controller.rb   |  2 +-
 .../public/api/v1/portals_controller.rb       |  2 +-
 .../api/v1/portals/_article_count.html.erb    |  6 ++
 .../api/v1/portals/_category-block.html.erb   |  7 +-
 .../public/api/v1/portals/_footer.html.erb    |  2 +-
 .../public/api/v1/portals/_header.html.erb    |  2 +-
 .../api/v1/portals/articles/index.html.erb    |  2 +-
 .../api/v1/portals/articles/show.html.erb     |  4 +-
 .../categories/_category-block.html.erb       | 74 ++++++++++++-------
 .../api/v1/portals/categories/_hero.html.erb  |  2 +-
 .../api/v1/portals/categories/show.html.erb   | 12 ++-
 config/locales/en.yml                         | 11 +++
 config/locales/fr.yml                         | 11 +++
 15 files changed, 120 insertions(+), 43 deletions(-)
 create mode 100644 app/controllers/public/api/v1/portals/base_controller.rb
 create mode 100644 app/views/public/api/v1/portals/_article_count.html.erb

diff --git a/app/controllers/public/api/v1/portals/articles_controller.rb b/app/controllers/public/api/v1/portals/articles_controller.rb
index a2d518d8e..5fccc9ad1 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -1,4 +1,4 @@
-class Public::Api::V1::Portals::ArticlesController < PublicController
+class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
   before_action :ensure_custom_domain_request, only: [:show, :index]
   before_action :portal
   before_action :set_category, except: [:index]
@@ -34,7 +34,7 @@ class Public::Api::V1::Portals::ArticlesController < PublicController
   end
 
   def list_params
-    params.permit(:query)
+    params.permit(:query, :locale)
   end
 
   def permitted_params
diff --git a/app/controllers/public/api/v1/portals/base_controller.rb b/app/controllers/public/api/v1/portals/base_controller.rb
new file mode 100644
index 000000000..35dbc3ff9
--- /dev/null
+++ b/app/controllers/public/api/v1/portals/base_controller.rb
@@ -0,0 +1,22 @@
+class Public::Api::V1::Portals::BaseController < PublicController
+  around_action :set_locale
+
+  private
+
+  def set_locale(&)
+    switch_locale_with_portal(&) if params[:locale].present?
+  end
+
+  def switch_locale_with_portal(&)
+    locale_without_variant = params[:locale].split('_')[0]
+    is_locale_available = I18n.available_locales.map(&:to_s).include?(params[:locale])
+    is_locale_variant_available = I18n.available_locales.map(&:to_s).include?(locale_without_variant)
+    if is_locale_available
+      @locale = params[:locale]
+    elsif is_locale_variant_available
+      @locale = locale_without_variant
+    end
+
+    I18n.with_locale(@locale, &)
+  end
+end
diff --git a/app/controllers/public/api/v1/portals/categories_controller.rb b/app/controllers/public/api/v1/portals/categories_controller.rb
index 6a6ba6377..b1096fbeb 100644
--- a/app/controllers/public/api/v1/portals/categories_controller.rb
+++ b/app/controllers/public/api/v1/portals/categories_controller.rb
@@ -1,4 +1,4 @@
-class Public::Api::V1::Portals::CategoriesController < PublicController
+class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals::BaseController
   before_action :ensure_custom_domain_request, only: [:show, :index]
   before_action :portal
   before_action :set_category, only: [:show]
diff --git a/app/controllers/public/api/v1/portals_controller.rb b/app/controllers/public/api/v1/portals_controller.rb
index da9b23956..fe51ed161 100644
--- a/app/controllers/public/api/v1/portals_controller.rb
+++ b/app/controllers/public/api/v1/portals_controller.rb
@@ -1,4 +1,4 @@
-class Public::Api::V1::PortalsController < PublicController
+class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseController
   before_action :ensure_custom_domain_request, only: [:show]
   before_action :portal
   before_action :redirect_to_portal_with_locale, only: [:show]
diff --git a/app/views/public/api/v1/portals/_article_count.html.erb b/app/views/public/api/v1/portals/_article_count.html.erb
new file mode 100644
index 000000000..497c52258
--- /dev/null
+++ b/app/views/public/api/v1/portals/_article_count.html.erb
@@ -0,0 +1,6 @@
+<% if article_count == 0 %>
+<% elsif article_count == 1 %>
+  <%= article_count %> <%= I18n.t('public_portal.common.article') %>
+<% else %>
+  <%= article_count %> <%= I18n.t('public_portal.common.articles') %>
+<% end %>
diff --git a/app/views/public/api/v1/portals/_category-block.html.erb b/app/views/public/api/v1/portals/_category-block.html.erb
index cf8e342a9..a3424d432 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -6,14 +6,13 @@
       </a>
     </h3>
     <span class="text-slate-500">
-      <%= category.articles.published.size %>
-      <%= category.articles.published.size === 1 ? 'article': 'articles' %>
+      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.size %>
     </span>
   </div>
   <div class="py-4 w-full mt-2 flex-grow">
     <% if category.articles.published.size == 0 %>
     <div class="h-full flex items-center justify-center bg-slate-50 rounded-xl mb-4">
-      <p class="text-sm text-slate-500">No articles here</p>
+      <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
     </div>
     <% else %>
       <% category.articles.published.take(5).each do |article| %>
@@ -47,7 +46,7 @@
       class="flex flex-row items-center text-base font-medium text-woot-500 hover:underline mt-4"
       style="color: <%= portal.color %>"
     >
-      View all articles
+      <%= I18n.t('public_portal.common.view_all_articles') %>
       <span class="ml-2">
         <svg
           class="w-4 h-4 fill-current text-woot-500"
diff --git a/app/views/public/api/v1/portals/_footer.html.erb b/app/views/public/api/v1/portals/_footer.html.erb
index 2d0533b78..6b266975c 100644
--- a/app/views/public/api/v1/portals/_footer.html.erb
+++ b/app/views/public/api/v1/portals/_footer.html.erb
@@ -2,7 +2,7 @@
 <footer class="pt-16 pb-8 flex flex-col items-center justify-center">
   <div class="mx-auto max-w-2xl">
     <p class="text-slate-700 py-2 text-center">
-      Made with <a class="hover:underline" href="https://www.chatwoot.com" target="_blank" rel="noopener noreferrer nofoll/ow">Chatwoot</a> 💙
+      <%= I18n.t('public_portal.footer.made_with') %> <a class="hover:underline" href="https://www.chatwoot.com" target="_blank" rel="noopener noreferrer nofoll/ow">Chatwoot</a> 💙
     </p>
   </div>
 </footer>
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index 59065d012..539aa8e64 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -8,7 +8,7 @@
       <% if @portal.homepage_link %>
       <div class="ml-8 border-l-1 border-slate-50 hidden md:block">
         <div class="flex-grow flex-shrink-0">
-          <a target="_blank" rel="noopener noreferrer nofollow" href="<%= @portal.homepage_link %>" class="flex flex-row items-center text-sm font-medium text-slate-700 hover:text-slate-800 hover:underline"> Go to main site
+          <a target="_blank" rel="noopener noreferrer nofollow" href="<%= @portal.homepage_link %>" class="flex flex-row items-center text-sm font-medium text-slate-700 hover:text-slate-800 hover:underline"> <%= I18n.t('public_portal.header.go_to_homepage') %>
             <span class="ml-2">
               <svg class="w-4 h-4 fill-current text-slate-600" width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="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" /></svg>
             </span>
diff --git a/app/views/public/api/v1/portals/articles/index.html.erb b/app/views/public/api/v1/portals/articles/index.html.erb
index 6bea67b54..c505d6663 100644
--- a/app/views/public/api/v1/portals/articles/index.html.erb
+++ b/app/views/public/api/v1/portals/articles/index.html.erb
@@ -6,7 +6,7 @@
 				class="text-slate-800 hover:underline leading-8"
         href="/hc/<%= @portal.slug %>/<%= @category.present? ? @category.slug : '' %>"
 			>
-				<%= @portal.name %> Home
+				<%= @portal.name %> <%= I18n.t('public_portal.common.home') %>
 			</a>
 		<span>/</span>
 		<span>/</span>
diff --git a/app/views/public/api/v1/portals/articles/show.html.erb b/app/views/public/api/v1/portals/articles/show.html.erb
index da5cdecb3..3b7d06f7b 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -18,7 +18,7 @@
         class="text-slate-700 hover:underline leading-8 text-sm font-medium"
         href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>"
       >
-        Home
+        <%= I18n.t('public_portal.common.home') %>
       </a>
       <span class="text-xs text-slate-600 px-1">/</span>
       <a
@@ -39,7 +39,7 @@
         <div class="pl-1">
           <h5 class="text-base font-medium text-slate-900 mb-2"><%= @article.author.available_name %></h5>
           <p class="text-sm font-normal text-slate-700">
-            Last updated on <%= @article.updated_at.strftime("%b %d, %Y") %></p>
+          <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: @article.updated_at.strftime("%b %d, %Y")) %>
         </div>
       </div>
     </div>
diff --git a/app/views/public/api/v1/portals/categories/_category-block.html.erb b/app/views/public/api/v1/portals/categories/_category-block.html.erb
index 9d06bb3bd..d99da3503 100644
--- a/app/views/public/api/v1/portals/categories/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/categories/_category-block.html.erb
@@ -2,41 +2,65 @@
 <section class="bg-white lg:container w-full py-6 px-4 flex flex-col h-full">
   <div class="flex justify-between items-center w-full">
     <h3 class="text-xl text-slate-900 font-semibold subpixel-antialiased leading-relaxed hover:underline"">
-     <a href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>"><%= category.name %> </a>
-      </h3> <span class="text-slate-500"><%= category.articles.published.size %> articles</span>
+     <a href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>">
+      <%= category.name %>
+    </a>
+    </h3>
+    <span class="text-slate-500">
+      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.size %>
+    </span>
   </div>
   <div class="py-4 w-full mt-2 flex-grow">
     <% if category.articles.published.size == 0 %>
-    <div class="h-full flex items-center justify-center bg-slate-50 rounded-xl mb-4">
-      <p class="text-sm text-slate-500">No articles here</p>
-    </div>
+      <div class="h-full flex items-center justify-center bg-slate-50 rounded-xl mb-4">
+        <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
+      </div>
     <% else %>
-    <% category.articles.published.take(5).each do |article| %>
-    <div class="flex justify-between content-center h-8 my-1">
-      <a class="text-slate-800 hover:underline leading-8"
-        href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>/<%= article.id %>" class=""><%= article.title %></a>
-      <span class="flex items-center">
-        <svg class="w-4 h-4 fill-current text-slate-700" width="24" height="24" fill="none" viewBox="0 0 24 24"
-          xmlns="http://www.w3.org/2000/svg">
-          <path
-            d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z" />
-        </svg>
-      </span>
-    </div>
-    <% end %>
+      <% category.articles.published.take(5).each do |article| %>
+        <div class="flex justify-between content-center h-8 my-1">
+          <a
+            class="text-slate-800 hover:underline leading-8"
+            href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>/<%= article.id %>"
+          >
+            <%= article.title %>
+          </a>
+          <span class="flex items-center">
+            <svg
+              class="w-4 h-4 fill-current text-slate-700"
+              width="24"
+              height="24"
+              fill="none"
+              viewBox="0 0 24 24"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z"
+              />
+            </svg>
+          </span>
+        </div>
+      <% end %>
     <% end %>
 
   </div>
   <div>
-    <a href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>"
-      class="flex flex-row items-center text-base font-medium text-woot-600 hover:text-slate-900 hover:underline mt-4">
-
-      View all articles
+    <a
+      href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>"
+      class="flex flex-row items-center text-base font-medium text-woot-600 hover:text-slate-900 hover:underline mt-4"
+    >
+      <%= I18n.t('public_portal.common.view_all_articles') %>
       <span class="ml-2">
-        <svg class="w-4 h-4 fill-current text-woot-500" width="24" height="24" fill="none" viewBox="0 0 24 24"
-          xmlns="http://www.w3.org/2000/svg">
+        <svg
+          class="w-4 h-4 fill-current text-woot-500"
+          width="24"
+          height="24"
+          fill="none"
+          viewBox="0 0 24 24"
+          xmlns="http://www.w3.org/2000/svg"
+        >
           <path
-            d="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" />
+            d="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"
+          />
         </svg>
       </span>
     </a>
diff --git a/app/views/public/api/v1/portals/categories/_hero.html.erb b/app/views/public/api/v1/portals/categories/_hero.html.erb
index 8be6431b1..f9a78c958 100644
--- a/app/views/public/api/v1/portals/categories/_hero.html.erb
+++ b/app/views/public/api/v1/portals/categories/_hero.html.erb
@@ -2,6 +2,6 @@
 <section class="bg-slate-50 py-16 flex flex-col items-center justify-center">
   <div class="mx-auto max-w-2xl">
     <h1 class="text-4xl text-slate-900 font-semibold subpixel-antialiased leading-relaxed text-center"><%= portal.header_text %></h1>
-    <p class="text-slate-700 py-2 text-center">Search for the articles here or browse the categories below.</p>
+    <p class="text-slate-700 py-2 text-center"><%= I18n.t('public_portal.hero.sub_title') %></p>
   </div>
 </section>
diff --git a/app/views/public/api/v1/portals/categories/show.html.erb b/app/views/public/api/v1/portals/categories/show.html.erb
index 72b0358e3..ebee41d46 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -11,14 +11,16 @@
       class="text-slate-700 text-sm hover:underline leading-8"
       href="/hc/<%= @portal.slug %>/<%= @category.locale %>"
     >
-      Home
+      <%= I18n.t('public_portal.common.home') %>
     </a>
     <span class="text-xs text-slate-600 px-1">/</span>
     <div class="flex justify-start items-center w-full">
       <h1 class="text-3xl font-bold leading-snug md:tracking-normal text-slate-900">
         <%= @category.name %>
       </h1>
-      <div class="text-slate-500 px-8 mt-2"><%= @category.articles.published.size %> articles</div>
+      <div class="text-slate-500 px-8 mt-2">
+        <%= render 'public/api/v1/portals/article_count', article_count: @category.articles.published.size %>
+      </div>
     </div>
   </div>
 </div>
@@ -27,7 +29,7 @@
   <div class="py-4 w-full mt-2 flex-grow">
     <% if @category.articles.published.size == 0 %>
     <div class="h-full flex items-center justify-center bg-slate-50 rounded-xl py-6">
-      <p class="text-sm text-slate-500">No articles here</p>
+      <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
     </div>
     <% else %>
     <% @category.articles.published.each do |article| %>
@@ -37,7 +39,9 @@
       >
         <div>
           <p class="font-medium mb-2 hover:underline"><%= article.title %></p>
-          <p class="text-sm">Last updated on <%= article.updated_at.strftime("%b %d, %Y") %></p>
+          <p class="text-sm">
+            <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %>
+          </p>
         </div>
 
         <span>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 55ad1dc18..2b2b9ac15 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -186,3 +186,14 @@ en:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b578ea860..6acc12c06 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -163,3 +163,14 @@ fr:
       results_title: Résultats de recherche
     hero:
       sub_title: Recherchez les articles ici ou parcourez les catégories ci-dessous.
+    common:
+      home: Page d'accueil
+      last_updated_on: Dernière mise à jour le %{last_updated_on}
+      view_all_articles: Voir tous les articles
+      article: article
+      articles: articles
+      no_articles: Il n'y a pas d'articles ici
+    footer:
+      made_with: Réalisé avec
+    header:
+      go_to_homepage: Aller à la page d'accueil

From 04f30e30334166d6884e8c4f91a85d4fc688abf0 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Mon, 27 Feb 2023 18:15:34 -0800
Subject: [PATCH 36/94] chore: Update translations (#6534)

---
 .../i18n/locale/ar/conversation.json          | 39 +++++++--
 .../i18n/locale/ar/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ar/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ar/login.json       |  5 ++
 .../dashboard/i18n/locale/ar/settings.json    |  6 +-
 .../dashboard/i18n/locale/ar/signup.json      |  3 +
 .../i18n/locale/bg/conversation.json          | 27 +++++-
 .../i18n/locale/bg/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/bg/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/bg/login.json       |  5 ++
 .../dashboard/i18n/locale/bg/settings.json    |  6 +-
 .../dashboard/i18n/locale/bg/signup.json      |  3 +
 .../i18n/locale/ca/conversation.json          | 27 +++++-
 .../i18n/locale/ca/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ca/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ca/login.json       |  5 ++
 .../dashboard/i18n/locale/ca/settings.json    |  6 +-
 .../dashboard/i18n/locale/ca/signup.json      |  3 +
 .../i18n/locale/cs/conversation.json          | 27 +++++-
 .../i18n/locale/cs/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/cs/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/cs/login.json       |  5 ++
 .../dashboard/i18n/locale/cs/settings.json    |  6 +-
 .../dashboard/i18n/locale/cs/signup.json      |  3 +
 .../i18n/locale/da/conversation.json          | 27 +++++-
 .../i18n/locale/da/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/da/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/da/login.json       |  5 ++
 .../dashboard/i18n/locale/da/settings.json    |  6 +-
 .../dashboard/i18n/locale/da/signup.json      |  3 +
 .../i18n/locale/de/conversation.json          | 27 +++++-
 .../i18n/locale/de/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/de/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/de/login.json       |  5 ++
 .../dashboard/i18n/locale/de/settings.json    |  6 +-
 .../dashboard/i18n/locale/de/signup.json      |  3 +
 .../i18n/locale/el/conversation.json          | 27 +++++-
 .../i18n/locale/el/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/el/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/el/login.json       |  5 ++
 .../dashboard/i18n/locale/el/settings.json    |  6 +-
 .../dashboard/i18n/locale/el/signup.json      |  3 +
 .../i18n/locale/es/conversation.json          | 33 ++++++-
 .../i18n/locale/es/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/es/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/es/login.json       |  5 ++
 .../dashboard/i18n/locale/es/settings.json    |  6 +-
 .../dashboard/i18n/locale/es/signup.json      |  3 +
 .../dashboard/i18n/locale/fa/agentMgmt.json   | 16 ++--
 .../i18n/locale/fa/conversation.json          | 29 ++++++-
 .../i18n/locale/fa/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/fa/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/fa/inboxMgmt.json   | 16 ++--
 .../i18n/locale/fa/integrations.json          |  8 +-
 .../dashboard/i18n/locale/fa/login.json       |  5 ++
 .../dashboard/i18n/locale/fa/settings.json    | 12 ++-
 .../dashboard/i18n/locale/fa/signup.json      |  5 +-
 .../i18n/locale/fi/conversation.json          | 27 +++++-
 .../i18n/locale/fi/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/fi/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/fi/login.json       |  5 ++
 .../dashboard/i18n/locale/fi/settings.json    |  6 +-
 .../dashboard/i18n/locale/fi/signup.json      |  3 +
 .../i18n/locale/fr/conversation.json          | 27 +++++-
 .../i18n/locale/fr/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/fr/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/fr/login.json       |  5 ++
 .../dashboard/i18n/locale/fr/settings.json    |  6 +-
 .../dashboard/i18n/locale/fr/signup.json      |  3 +
 .../i18n/locale/he/conversation.json          | 27 +++++-
 .../i18n/locale/he/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/he/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/he/login.json       |  5 ++
 .../dashboard/i18n/locale/he/settings.json    |  6 +-
 .../dashboard/i18n/locale/he/signup.json      |  3 +
 .../i18n/locale/hi/conversation.json          | 27 +++++-
 .../i18n/locale/hi/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/hi/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/hi/login.json       |  5 ++
 .../dashboard/i18n/locale/hi/settings.json    |  6 +-
 .../dashboard/i18n/locale/hi/signup.json      |  3 +
 .../i18n/locale/hu/conversation.json          | 27 +++++-
 .../i18n/locale/hu/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/hu/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/hu/login.json       |  5 ++
 .../dashboard/i18n/locale/hu/settings.json    |  6 +-
 .../dashboard/i18n/locale/hu/signup.json      |  3 +
 .../i18n/locale/id/conversation.json          | 27 +++++-
 .../i18n/locale/id/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/id/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/id/login.json       |  5 ++
 .../dashboard/i18n/locale/id/settings.json    |  6 +-
 .../dashboard/i18n/locale/id/signup.json      |  3 +
 .../i18n/locale/is/conversation.json          | 27 +++++-
 .../i18n/locale/is/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/is/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/is/login.json       |  5 ++
 .../dashboard/i18n/locale/is/settings.json    |  6 +-
 .../dashboard/i18n/locale/is/signup.json      |  3 +
 .../i18n/locale/it/conversation.json          | 27 +++++-
 .../i18n/locale/it/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/it/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/it/login.json       |  5 ++
 .../dashboard/i18n/locale/it/settings.json    |  6 +-
 .../dashboard/i18n/locale/it/signup.json      |  3 +
 .../i18n/locale/ja/conversation.json          | 27 +++++-
 .../i18n/locale/ja/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ja/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ja/login.json       |  5 ++
 .../dashboard/i18n/locale/ja/settings.json    |  6 +-
 .../dashboard/i18n/locale/ja/signup.json      |  3 +
 .../i18n/locale/ka/conversation.json          | 27 +++++-
 .../i18n/locale/ka/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ka/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ka/login.json       |  5 ++
 .../dashboard/i18n/locale/ka/settings.json    |  6 +-
 .../dashboard/i18n/locale/ka/signup.json      |  3 +
 .../i18n/locale/ko/conversation.json          | 27 +++++-
 .../i18n/locale/ko/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ko/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ko/login.json       |  5 ++
 .../dashboard/i18n/locale/ko/settings.json    |  6 +-
 .../dashboard/i18n/locale/ko/signup.json      |  3 +
 .../i18n/locale/lt/conversation.json          | 27 +++++-
 .../i18n/locale/lt/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/lt/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/lt/login.json       |  5 ++
 .../dashboard/i18n/locale/lt/settings.json    |  6 +-
 .../dashboard/i18n/locale/lt/signup.json      |  3 +
 .../i18n/locale/lv/conversation.json          | 27 +++++-
 .../i18n/locale/lv/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/lv/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/lv/login.json       |  5 ++
 .../dashboard/i18n/locale/lv/settings.json    |  6 +-
 .../dashboard/i18n/locale/lv/signup.json      |  3 +
 .../i18n/locale/ml/conversation.json          | 27 +++++-
 .../i18n/locale/ml/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ml/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ml/login.json       |  5 ++
 .../dashboard/i18n/locale/ml/settings.json    |  6 +-
 .../dashboard/i18n/locale/ml/signup.json      |  3 +
 .../i18n/locale/ms/conversation.json          | 27 +++++-
 .../i18n/locale/ms/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ms/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ms/login.json       |  5 ++
 .../dashboard/i18n/locale/ms/settings.json    |  6 +-
 .../dashboard/i18n/locale/ms/signup.json      |  3 +
 .../i18n/locale/ne/conversation.json          | 27 +++++-
 .../i18n/locale/ne/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ne/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ne/login.json       |  5 ++
 .../dashboard/i18n/locale/ne/settings.json    |  6 +-
 .../dashboard/i18n/locale/ne/signup.json      |  3 +
 .../i18n/locale/nl/conversation.json          | 27 +++++-
 .../i18n/locale/nl/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/nl/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/nl/login.json       |  5 ++
 .../dashboard/i18n/locale/nl/settings.json    |  6 +-
 .../dashboard/i18n/locale/nl/signup.json      |  3 +
 .../i18n/locale/no/conversation.json          | 27 +++++-
 .../i18n/locale/no/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/no/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/no/login.json       |  5 ++
 .../dashboard/i18n/locale/no/settings.json    |  6 +-
 .../dashboard/i18n/locale/no/signup.json      |  3 +
 .../i18n/locale/pl/conversation.json          | 27 +++++-
 .../i18n/locale/pl/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/pl/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/pl/login.json       |  5 ++
 .../dashboard/i18n/locale/pl/settings.json    |  6 +-
 .../dashboard/i18n/locale/pl/signup.json      |  3 +
 .../dashboard/i18n/locale/pt/bulkActions.json |  2 +-
 .../dashboard/i18n/locale/pt/cannedMgmt.json  |  4 +-
 .../dashboard/i18n/locale/pt/chatlist.json    |  6 +-
 .../dashboard/i18n/locale/pt/contact.json     | 10 +--
 .../i18n/locale/pt/conversation.json          | 85 ++++++++++++-------
 .../i18n/locale/pt/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/pt/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/pt/login.json       |  5 ++
 .../dashboard/i18n/locale/pt/settings.json    |  6 +-
 .../dashboard/i18n/locale/pt/signup.json      |  3 +
 .../i18n/locale/pt_BR/conversation.json       | 27 +++++-
 .../i18n/locale/pt_BR/generalSettings.json    |  1 +
 .../i18n/locale/pt_BR/helpCenter.json         | 11 +++
 .../dashboard/i18n/locale/pt_BR/login.json    |  5 ++
 .../dashboard/i18n/locale/pt_BR/settings.json |  6 +-
 .../dashboard/i18n/locale/pt_BR/signup.json   |  3 +
 .../i18n/locale/pt_BR/whatsappTemplates.json  |  2 +-
 .../i18n/locale/ro/conversation.json          | 27 +++++-
 .../i18n/locale/ro/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ro/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ro/login.json       |  5 ++
 .../dashboard/i18n/locale/ro/settings.json    |  6 +-
 .../dashboard/i18n/locale/ro/signup.json      |  3 +
 .../i18n/locale/ru/conversation.json          | 27 +++++-
 .../i18n/locale/ru/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ru/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ru/login.json       |  5 ++
 .../dashboard/i18n/locale/ru/settings.json    |  6 +-
 .../dashboard/i18n/locale/ru/signup.json      |  3 +
 .../i18n/locale/sk/conversation.json          | 27 +++++-
 .../i18n/locale/sk/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/sk/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/sk/login.json       |  5 ++
 .../dashboard/i18n/locale/sk/settings.json    |  6 +-
 .../dashboard/i18n/locale/sk/signup.json      |  3 +
 .../i18n/locale/sr/conversation.json          | 27 +++++-
 .../i18n/locale/sr/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/sr/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/sr/login.json       |  5 ++
 .../dashboard/i18n/locale/sr/settings.json    |  6 +-
 .../dashboard/i18n/locale/sr/signup.json      |  3 +
 .../i18n/locale/sv/conversation.json          | 27 +++++-
 .../i18n/locale/sv/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/sv/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/sv/login.json       |  5 ++
 .../dashboard/i18n/locale/sv/settings.json    |  6 +-
 .../dashboard/i18n/locale/sv/signup.json      |  3 +
 .../i18n/locale/ta/conversation.json          | 27 +++++-
 .../i18n/locale/ta/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ta/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ta/login.json       |  5 ++
 .../dashboard/i18n/locale/ta/settings.json    |  6 +-
 .../dashboard/i18n/locale/ta/signup.json      |  3 +
 .../i18n/locale/th/conversation.json          | 27 +++++-
 .../i18n/locale/th/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/th/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/th/login.json       |  5 ++
 .../dashboard/i18n/locale/th/settings.json    |  6 +-
 .../dashboard/i18n/locale/th/signup.json      |  3 +
 .../i18n/locale/tr/conversation.json          | 27 +++++-
 .../i18n/locale/tr/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/tr/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/tr/login.json       |  5 ++
 .../dashboard/i18n/locale/tr/settings.json    |  6 +-
 .../dashboard/i18n/locale/tr/signup.json      |  3 +
 .../i18n/locale/uk/conversation.json          | 27 +++++-
 .../i18n/locale/uk/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/uk/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/uk/login.json       |  5 ++
 .../dashboard/i18n/locale/uk/settings.json    |  6 +-
 .../dashboard/i18n/locale/uk/signup.json      |  3 +
 .../i18n/locale/ur/conversation.json          | 27 +++++-
 .../i18n/locale/ur/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/ur/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/ur/login.json       |  5 ++
 .../dashboard/i18n/locale/ur/settings.json    |  6 +-
 .../dashboard/i18n/locale/ur/signup.json      |  3 +
 .../i18n/locale/ur_IN/conversation.json       | 27 +++++-
 .../i18n/locale/ur_IN/generalSettings.json    |  1 +
 .../i18n/locale/ur_IN/helpCenter.json         | 11 +++
 .../dashboard/i18n/locale/ur_IN/login.json    |  5 ++
 .../dashboard/i18n/locale/ur_IN/settings.json |  6 +-
 .../dashboard/i18n/locale/ur_IN/signup.json   |  3 +
 .../i18n/locale/vi/conversation.json          | 27 +++++-
 .../i18n/locale/vi/generalSettings.json       |  1 +
 .../dashboard/i18n/locale/vi/helpCenter.json  | 11 +++
 .../dashboard/i18n/locale/vi/login.json       |  5 ++
 .../dashboard/i18n/locale/vi/settings.json    |  6 +-
 .../dashboard/i18n/locale/vi/signup.json      |  3 +
 .../i18n/locale/zh_CN/conversation.json       | 27 +++++-
 .../i18n/locale/zh_CN/generalSettings.json    |  1 +
 .../i18n/locale/zh_CN/helpCenter.json         | 11 +++
 .../dashboard/i18n/locale/zh_CN/login.json    |  5 ++
 .../dashboard/i18n/locale/zh_CN/settings.json |  6 +-
 .../dashboard/i18n/locale/zh_CN/signup.json   |  3 +
 .../i18n/locale/zh_TW/conversation.json       | 27 +++++-
 .../i18n/locale/zh_TW/generalSettings.json    |  1 +
 .../i18n/locale/zh_TW/helpCenter.json         | 11 +++
 .../dashboard/i18n/locale/zh_TW/login.json    |  5 ++
 .../dashboard/i18n/locale/zh_TW/settings.json |  6 +-
 .../dashboard/i18n/locale/zh_TW/signup.json   |  3 +
 app/javascript/widget/i18n/locale/fa.json     |  2 +-
 config/locales/ar.yml                         | 18 ++++
 config/locales/bg.yml                         | 18 ++++
 config/locales/ca.yml                         | 18 ++++
 config/locales/cs.yml                         | 18 ++++
 config/locales/da.yml                         | 18 ++++
 config/locales/de.yml                         | 18 ++++
 config/locales/el.yml                         | 18 ++++
 config/locales/es.yml                         | 18 ++++
 config/locales/fa.yml                         | 24 +++++-
 config/locales/fi.yml                         | 18 ++++
 config/locales/fr.yml                         |  7 ++
 config/locales/he.yml                         | 18 ++++
 config/locales/hi.yml                         | 18 ++++
 config/locales/hu.yml                         | 18 ++++
 config/locales/id.yml                         | 18 ++++
 config/locales/is.yml                         | 18 ++++
 config/locales/it.yml                         | 18 ++++
 config/locales/ja.yml                         | 18 ++++
 config/locales/ka.yml                         | 18 ++++
 config/locales/ko.yml                         | 18 ++++
 config/locales/lt.yml                         | 18 ++++
 config/locales/lv.yml                         | 18 ++++
 config/locales/ml.yml                         | 18 ++++
 config/locales/ms.yml                         | 18 ++++
 config/locales/ne.yml                         | 18 ++++
 config/locales/nl.yml                         | 18 ++++
 config/locales/no.yml                         | 18 ++++
 config/locales/pl.yml                         | 18 ++++
 config/locales/pt.yml                         | 18 ++++
 config/locales/pt_BR.yml                      | 18 ++++
 config/locales/ro.yml                         | 18 ++++
 config/locales/ru.yml                         | 18 ++++
 config/locales/sk.yml                         | 18 ++++
 config/locales/sr.yml                         | 18 ++++
 config/locales/sv.yml                         | 18 ++++
 config/locales/ta.yml                         | 18 ++++
 config/locales/th.yml                         | 18 ++++
 config/locales/tr.yml                         | 18 ++++
 config/locales/uk.yml                         | 18 ++++
 config/locales/ur.yml                         | 18 ++++
 config/locales/ur_IN.yml                      | 18 ++++
 config/locales/vi.yml                         | 18 ++++
 config/locales/zh_CN.yml                      | 18 ++++
 config/locales/zh_TW.yml                      | 18 ++++
 317 files changed, 3104 insertions(+), 167 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index 6b09e0f64..dee8999d9 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -35,7 +35,7 @@
     "REMOVE_SELECTION": "إزالة التحديد",
     "DOWNLOAD": "تنزيل",
     "UNKNOWN_FILE_TYPE": "ملف غير معروف",
-    "SAVE_CONTACT": "Save",
+    "SAVE_CONTACT": "حفظ",
     "UPLOADING_ATTACHMENTS": "جاري تحميل المرفقات...",
     "SUCCESS_DELETE_MESSAGE": "تم حذف الرسالة بنجاح",
     "FAIL_DELETE_MESSSAGE": "تعذر حذف الرسالة! حاول مرة أخرى",
@@ -43,8 +43,8 @@
     "RATING_TITLE": "التقييم",
     "FEEDBACK_TITLE": "الملاحظات",
     "CARD": {
-      "SHOW_LABELS": "Show labels",
-      "HIDE_LABELS": "Hide labels"
+      "SHOW_LABELS": "إظهار السمات",
+      "HIDE_LABELS": "إخفاء السمات"
     },
     "HEADER": {
       "RESOLVE_ACTION": "إغلاق المحادثة",
@@ -69,7 +69,7 @@
     "CARD_CONTEXT_MENU": {
       "PENDING": "تحديد كمعلق",
       "RESOLVED": "تحديد كمحلولة",
-      "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_UNREAD": "وضع علامة كغير مقروء",
       "REOPEN": "إعادة فتح المحادثة",
       "SNOOZE": {
         "TITLE": "غفوة",
@@ -135,8 +135,8 @@
         }
       },
       "UNDEFINED_VARIABLES": {
-        "TITLE": "Undefined variables",
-        "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
+        "TITLE": "متغيرات غير معرفة",
+        "MESSAGE": "لديك {undefinedVariablesCount} متغيرات غير محددة في رسالتك: {undefinedVariables}. هل ترغب في إرسال الرسالة على أي حال؟",
         "CONFIRM": {
           "YES": "إرسال",
           "CANCEL": "إلغاء"
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "نسخ",
       "DELETE": "حذف",
-      "CREATE_A_CANNED_RESPONSE": "إضافة إلى الردود السريعة"
+      "CREATE_A_CANNED_RESPONSE": "إضافة إلى الردود السريعة",
+      "TRANSLATE": "ترجم"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "الموضوع"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "شارك",
+    "SIDEBAR_TITLE": "المشاركون في المحادثة",
+    "NO_RECORDS_FOUND": "لم يتم العثور على النتائج",
+    "ADD_PARTICIPANTS": "اختر المشاركين",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} أخرى",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} أخرى",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} شخص مشارك.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} شخص مشارك.",
+    "NO_PARTICIPANTS_TEXT": "لا أحد يشارك !.",
+    "WATCH_CONVERSATION": "الانضمام إلى المحادثة",
+    "YOU_ARE_WATCHING": "أنت مشترك",
+    "API": {
+      "ERROR_MESSAGE": "تعذر التحديث، حاول مرة أخرى!",
+      "SUCCESS_MESSAGE": "تم تحديث المشاركين!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "عرض المحتوى المترجم",
+    "DESC": "يمكنك عرض المحتوى المترجم في كل لغة.",
+    "ORIGINAL_CONTENT": "المحتوى الأصلي",
+    "TRANSLATED_CONTENT": "المحتوى المترجم",
+    "NO_TRANSLATIONS_AVAILABLE": "لا توجد ترجمات لهذا المحتوى"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index f72fb052e..3bac19919 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "محادثة جديدة",
       "conversation_assignment": "تم تعيين المحادثة",
       "assigned_conversation_new_message": "رسالة جديدة",
+      "participating_conversation_new_message": "رسالة جديدة",
       "conversation_mention": "إشارة"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
index 5295c0abf..d90f532df 100644
--- a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "جاري الحفظ...",
       "SAVED": "تم الحفظ"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "رفع صورة",
+        "UPLOADING": "جاري الرفع...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "إعدادات المقالة",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/login.json b/app/javascript/dashboard/i18n/locale/ar/login.json
index caf74b78a..c98fb00b2 100644
--- a/app/javascript/dashboard/i18n/locale/ar/login.json
+++ b/app/javascript/dashboard/i18n/locale/ar/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً",
       "UNAUTH": "اسم المستخدم / كلمة المرور غير صحيحة. الرجاء المحاولة مرة أخرى"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "نسيت كلمة المرور؟",
     "CREATE_NEW_ACCOUNT": "إنشاء حساب جديد",
     "SUBMIT": "تسجيل الدخول"
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index c7cf79392..f8187ecd4 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "إرسال إشعارات البريد الإلكتروني عند إسناد محادثة لي",
         "CONVERSATION_CREATION": "إرسال إشعارات للبريد الإلكتروني عند ورود محادثة جديدة",
         "CONVERSATION_MENTION": "إرسال إشعارات بالبريد الإلكتروني عندما يتم ذكرك في محادثة",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "إرسال إشعارات البريد الإلكتروني عند إنشاء رسالة جديدة في محادثة موكلة"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "إرسال إشعارات البريد الإلكتروني عند إنشاء رسالة جديدة في محادثة موكلة",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "إرسال إشعارات التنية عند إنشاء رسالة جديدة في محادثة موكلة"
       },
       "API": {
         "UPDATE_SUCCESS": "يتم تحديث إعدادات الإشعارات بنجاح",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "إرسال إشعارات المتصفح عند ورود محادثة جديدة",
         "CONVERSATION_MENTION": "إرسال إشعارات بالبريد الإلكتروني عندما يتم ذكرك او الاشارة اليك في محادثة",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "إرسال إشعارات التنية عند إنشاء رسالة جديدة في محادثة موكلة",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "إرسال إشعارات التنية عند إنشاء رسالة جديدة في محادثة موكلة",
         "HAS_ENABLED_PUSH": "لقد قمت بتمكين الإشعارات لهذا المتصفح.",
         "REQUEST_PUSH": "تفعيل إشعارات المتصفح"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "المحادثات",
     "ALL_CONVERSATIONS": "كل المحادثات",
     "MENTIONED_CONVERSATIONS": "الإشارات",
+    "PARTICIPATING_CONVERSATIONS": "شارك",
     "UNATTENDED_CONVERSATIONS": "بدون حضور",
     "REPORTS": "التقارير",
     "SETTINGS": "الإعدادات",
@@ -239,6 +242,7 @@
       "DRAFT": "مسودة",
       "ARCHIVED": "مؤرشفة",
       "CATEGORY": "الفئة",
+      "SETTINGS": "الإعدادات",
       "CATEGORY_EMPTY_MESSAGE": "لم يتم العثور على فئات"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/signup.json b/app/javascript/dashboard/i18n/locale/ar/signup.json
index 7fa5e5c0a..e49d97f88 100644
--- a/app/javascript/dashboard/i18n/locale/ar/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ar/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "إن كل ما يلزم هو خطوة واحدة للمضي قدما",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "من خلال التسجيل، فإنك توافق على <a href=\"https://www.chatwoot.com/terms\">شروط الخدمة</a> و <a href=\"https://www.chatwoot.com/privacy-policy\">سياسة الخصوصية</a>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index 89f6a26f3..1f627a333 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Изтрий",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Няма намерени резултати",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index ecda8fbd0..f2ba3f132 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
index 3de6a964e..a6e452b94 100644
--- a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Качване...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/login.json b/app/javascript/dashboard/i18n/locale/bg/login.json
index e3481a80d..a75430cb2 100644
--- a/app/javascript/dashboard/i18n/locale/bg/login.json
+++ b/app/javascript/dashboard/i18n/locale/bg/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 3ff0241a1..6c892bba3 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Разговори",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Споменавания",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/signup.json b/app/javascript/dashboard/i18n/locale/bg/signup.json
index 2d5d4cb60..aa9669b89 100644
--- a/app/javascript/dashboard/i18n/locale/bg/signup.json
+++ b/app/javascript/dashboard/i18n/locale/bg/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index e5abf4105..5595c149b 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copia",
       "DELETE": "Esborrar",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No s'ha trobat agents",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 2f7c4256c..3fa6780f4 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nova conversació",
       "conversation_assignment": "Conversació Assignada",
       "assigned_conversation_new_message": "Missatge Nou",
+      "participating_conversation_new_message": "Missatge Nou",
       "conversation_mention": "Menció"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
index 6e6c2370e..ae83adb41 100644
--- a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Puja imatge",
+        "UPLOADING": "S'està carregant...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/login.json b/app/javascript/dashboard/i18n/locale/ca/login.json
index 3c62ee837..2b5bcdb71 100644
--- a/app/javascript/dashboard/i18n/locale/ca/login.json
+++ b/app/javascript/dashboard/i18n/locale/ca/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant",
       "UNAUTH": "Nom d'usuari / contrasenya incorrecte. Torna-ho a provar-ho"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Has oblidat la contrasenya?",
     "CREATE_NEW_ACCOUNT": "Crear un nou compte",
     "SUBMIT": "Inicia la sessió"
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index c2261ee9d..c5da6a2c6 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Envieu notificacions per correu electrònic quan se m’assigni una conversa",
         "CONVERSATION_CREATION": "Envieu notificacions per correu electrònic quan es crea una nova conversa",
         "CONVERSATION_MENTION": "Enviar notificacions per mail quan siguis esmentat en una conversació",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envia notificacions per correu electrònic quan es creï un missatge nou en una conversa assignada"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envia notificacions per correu electrònic quan es creï un missatge nou en una conversa assignada",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Les teves preferències de notificació s’han actualitzat correctament",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Envia notificacions automàtiques quan es creï una conversa nova",
         "CONVERSATION_MENTION": "Enviar notificacions push quan siguis esmentat en una conversació",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envia notificacions automàtiques quan es creï un missatge nou en una conversa assignada",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Heu activat les notificacions per a aquest navegador.",
         "REQUEST_PUSH": "Activa les notificacions"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Converses",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mencions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Informes",
     "SETTINGS": "Configuracions",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Configuracions",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/signup.json b/app/javascript/dashboard/i18n/locale/ca/signup.json
index 3d6785acc..16dead7a5 100644
--- a/app/javascript/dashboard/i18n/locale/ca/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ca/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index b0e47e578..69e9d3b71 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopírovat",
       "DELETE": "Vymazat",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Předmět"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Žádné výsledky",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index bf801a8d9..4563aae25 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nová konverzace",
       "conversation_assignment": "Přiřazená konverzace",
       "assigned_conversation_new_message": "Nová zpráva",
+      "participating_conversation_new_message": "Nová zpráva",
       "conversation_mention": "Zmínka"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
index 02570c1c2..7faae4a1d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Ukládání...",
       "SAVED": "Uloženo"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Nahrát obrázek",
+        "UPLOADING": "Nahrávání...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Nastavení článků",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/login.json b/app/javascript/dashboard/i18n/locale/cs/login.json
index 767b0793a..cf7dad52a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/login.json
+++ b/app/javascript/dashboard/i18n/locale/cs/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později",
       "UNAUTH": "Nesprávné uživatelské jméno / heslo. Zkuste to prosím znovu"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Zapomněli jste heslo?",
     "CREATE_NEW_ACCOUNT": "Vytvořit nový účet",
     "SUBMIT": "Přihlásit se"
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 5cfe58dcd..b78cddff7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Odeslat e-mailová oznámení, když je mi přiřazena konverzace",
         "CONVERSATION_CREATION": "Odeslat oznámení e-mailem při vytváření nové konverzace",
         "CONVERSATION_MENTION": "Odeslat oznámení e-mailem, pokud jste zmíněni v konverzaci",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odeslat oznámení e-mailem, když je nová zpráva vytvořena v přiřazené konverzaci"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odeslat oznámení e-mailem, když je nová zpráva vytvořena v přiřazené konverzaci",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Vaše předvolby oznámení byly úspěšně aktualizovány",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Odeslat push oznámení při vytváření nové konverzace",
         "CONVERSATION_MENTION": "Poslat push oznámení, když jste zmíněni v konverzaci",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odeslat push oznámení, když je nová zpráva vytvořena v přiřazené konverzaci",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Povolili jste push pro tento prohlížeč.",
         "REQUEST_PUSH": "Povolit push oznámení"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Konverzace",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Zmínky",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Zprávy",
     "SETTINGS": "Nastavení",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Nastavení",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/signup.json b/app/javascript/dashboard/i18n/locale/cs/signup.json
index 58fbdef61..f05140e49 100644
--- a/app/javascript/dashboard/i18n/locale/cs/signup.json
+++ b/app/javascript/dashboard/i18n/locale/cs/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 897b16863..1e8c97d3f 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopiér",
       "DELETE": "Slet",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Emne"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Ingen resultater fundet",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index d38b8dbf0..22251505b 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Ny samtale",
       "conversation_assignment": "Samtale Tildelt",
       "assigned_conversation_new_message": "Ny Besked",
+      "participating_conversation_new_message": "Ny Besked",
       "conversation_mention": "Omtale"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/da/helpCenter.json b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
index 6313be2b0..be50c8254 100644
--- a/app/javascript/dashboard/i18n/locale/da/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Gemmer...",
       "SAVED": "Gemt"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload billede",
+        "UPLOADING": "Uploader...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Artikel Indstillinger",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/da/login.json b/app/javascript/dashboard/i18n/locale/da/login.json
index f4a2dbf11..6f5f123eb 100644
--- a/app/javascript/dashboard/i18n/locale/da/login.json
+++ b/app/javascript/dashboard/i18n/locale/da/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere",
       "UNAUTH": "Brugernavn / adgangskode forkert. Prøv igen"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Glemt din adgangskode?",
     "CREATE_NEW_ACCOUNT": "Opret ny konto",
     "SUBMIT": "Log Ind"
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index f63e0d2d9..ade808a68 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Send e-mail notifikationer når en samtale er tildelt mig",
         "CONVERSATION_CREATION": "Send e-mail notifikationer når en ny samtale er oprettet",
         "CONVERSATION_MENTION": "Send e-mail notifikationer, når du er nævnt i en samtale",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send e-mail notifikationer når en ny besked er oprettet i en tildelt samtale"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send e-mail notifikationer når en ny besked er oprettet i en tildelt samtale",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Dine notifikationsindstillinger er opdateret",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Send push-notifikationer, når en ny samtale er oprettet",
         "CONVERSATION_MENTION": "Send push-notifikationer, når du er nævnt i en samtale",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push-notifikationer, når en ny besked oprettes i en tildelt samtale",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Du har aktiveret push for denne browser.",
         "REQUEST_PUSH": "Aktivér push-notifikationer"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Samtaler",
     "ALL_CONVERSATIONS": "Alle Samtaler",
     "MENTIONED_CONVERSATIONS": "Omtaler",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattet",
     "REPORTS": "Rapporter",
     "SETTINGS": "Indstillinger",
@@ -239,6 +242,7 @@
       "DRAFT": "Kladde",
       "ARCHIVED": "Arkiveret",
       "CATEGORY": "Kategori",
+      "SETTINGS": "Indstillinger",
       "CATEGORY_EMPTY_MESSAGE": "Ingen kategorier fundet"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/da/signup.json b/app/javascript/dashboard/i18n/locale/da/signup.json
index 158621844..dd9206bd0 100644
--- a/app/javascript/dashboard/i18n/locale/da/signup.json
+++ b/app/javascript/dashboard/i18n/locale/da/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Alt, hvad der skal til, er blot et skridt for at komme videre",
     "TESTIMONIAL_CONTENT": "Du er et skridt fra at engagere dine kunder, fastholde dem og finde nye kunder.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Firmanavn",
       "PLACEHOLDER": "Indtast dit firmanavn, fx: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 4481921ff..2ff7277b2 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopieren",
       "DELETE": "Löschen",
-      "CREATE_A_CANNED_RESPONSE": "Zu vorgefertigten Antworten hinzufügen"
+      "CREATE_A_CANNED_RESPONSE": "Zu vorgefertigten Antworten hinzufügen",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Betreff"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Keine Ergebnisse gefunden",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index 3a9b4f662..bd448e524 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Neue Konversation",
       "conversation_assignment": "Konversation zugewiesen",
       "assigned_conversation_new_message": "Neue Nachricht",
+      "participating_conversation_new_message": "Neue Nachricht",
       "conversation_mention": "Erwähnung"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/de/helpCenter.json b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
index d8876dde8..a5ebf08a5 100644
--- a/app/javascript/dashboard/i18n/locale/de/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Speichern...",
       "SAVED": "Gespeichert"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Bild hochladen",
+        "UPLOADING": "Hochladen...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Artikeleinstellungen",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/de/login.json b/app/javascript/dashboard/i18n/locale/de/login.json
index 5f703ea37..37542c323 100644
--- a/app/javascript/dashboard/i18n/locale/de/login.json
+++ b/app/javascript/dashboard/i18n/locale/de/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut",
       "UNAUTH": "Benutzername / Passwort falsch. Bitte versuche es erneut"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Haben Sie Ihr Passwort vergessen?",
     "CREATE_NEW_ACCOUNT": "Neuen Account erstellen",
     "SUBMIT": "Einloggen"
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 9006017ea..b8feb06e5 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Senden Sie E-Mail-Benachrichtigungen, wenn mir ein Gespräch zugewiesen wurde",
         "CONVERSATION_CREATION": "Senden Sie E-Mail-Benachrichtigungen, wenn eine neue Konversation erstellt wird",
         "CONVERSATION_MENTION": "Senden Sie E-Mail-Benachrichtigungen, wenn Sie in einer Konversation erwähnt werden",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Senden Sie E-Mail-Benachrichtigungen, wenn eine neue Nachricht in einer zugewiesenen Konversation erstellt wird"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Senden Sie E-Mail-Benachrichtigungen, wenn eine neue Nachricht in einer zugewiesenen Konversation erstellt wird",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Ihre Benachrichtigungseinstellungen wurden erfolgreich aktualisiert",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Push-Benachrichtigungen senden, wenn eine neue Konversation startet",
         "CONVERSATION_MENTION": "Senden Sie Push-Benachrichtigungen, wenn Sie in einer Konversation erwähnt werden",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Senden Sie Push-Benachrichtigungen, wenn eine neue Nachricht in einer zugewiesenen Konversation erstellt wird",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Sie haben die Push-Benachrichtigung für diesen Browser aktiviert.",
         "REQUEST_PUSH": "Push-Benachrichtigungen aktivieren"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Gespräche",
     "ALL_CONVERSATIONS": "Alle Konversationen",
     "MENTIONED_CONVERSATIONS": "Erwähnungen",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unbeaufsichtigt",
     "REPORTS": "Berichte",
     "SETTINGS": "Einstellungen",
@@ -239,6 +242,7 @@
       "DRAFT": "Entwürfe",
       "ARCHIVED": "Archiviert",
       "CATEGORY": "Kategorie",
+      "SETTINGS": "Einstellungen",
       "CATEGORY_EMPTY_MESSAGE": "Keine Kategorien gefunden"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/de/signup.json b/app/javascript/dashboard/i18n/locale/de/signup.json
index 348f564df..1107b6e4a 100644
--- a/app/javascript/dashboard/i18n/locale/de/signup.json
+++ b/app/javascript/dashboard/i18n/locale/de/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Alles, was er braucht, ist ein Schritt, um vorwärtszugehen",
     "TESTIMONIAL_CONTENT": "Sie sind nur noch einen Schritt davon entfernt, Ihre Kunden zu gewinnen, zu binden und neue zu finden.",
     "TERMS_ACCEPT": "Durch die Erstellung eines Kontos stimmen Sie unseren <a href=\"https://www.chatwoot.com/terms-of-service\">Allgemeinn Geschäftsbedingungen</a> und unserer <a href=\"https://www.chatwoot.com/privacy-policy\">Datenschutzrichtlinie</a> zu",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Firmenname",
       "PLACEHOLDER": "Geben Sie Ihren Firmennamen ein, z. B.: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index c5aa1cda7..f9d725d4b 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Αντιγραφή",
       "DELETE": "Διαγραφή",
-      "CREATE_A_CANNED_RESPONSE": "Προσθήκη στις έτοιμες απαντήσεις"
+      "CREATE_A_CANNED_RESPONSE": "Προσθήκη στις έτοιμες απαντήσεις",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Θέμα"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Δεν βρέθηκαν αποτελέσματα",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index 23ea18ca7..46d815076 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Νέα συνομιλία",
       "conversation_assignment": "Η Συνομιλία Ανατέθηκε",
       "assigned_conversation_new_message": "Νέο Μήνυμα",
+      "participating_conversation_new_message": "Νέο Μήνυμα",
       "conversation_mention": "Αναφορά"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/el/helpCenter.json b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
index 1f25e16e8..c9fb2b3b3 100644
--- a/app/javascript/dashboard/i18n/locale/el/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Αποθηκεύεται...",
       "SAVED": "Αποθηκεύτηκε"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Ανέβασμα Εικόνας",
+        "UPLOADING": "Ανέβασμα...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Ρυθμίσεις Άρθρου",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/el/login.json b/app/javascript/dashboard/i18n/locale/el/login.json
index f0ae8f37e..d4f6a9185 100644
--- a/app/javascript/dashboard/i18n/locale/el/login.json
+++ b/app/javascript/dashboard/i18n/locale/el/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα",
       "UNAUTH": "Το όνομα χρήστη ή ο κωδικός δεν είναι σωστός. Παρακαλώ ξαναπροσπαθήστε"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Ξεχάσατε τον κωδικό;",
     "CREATE_NEW_ACCOUNT": "Δημιουργία νέου Λογαριασμού",
     "SUBMIT": "Είσοδος"
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 3a6c8fd46..382d780dd 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Να στέλνεται ειδοποίηση email όταν μια συνομιλία αντιστοιχίζεται σε μένα",
         "CONVERSATION_CREATION": "Να στέλνεται ειδοποίηση όταν δημιουργείται μια νέα συνομιλία",
         "CONVERSATION_MENTION": "Αποστολή ειδοποιήσεων email όταν αναφέρεστε σε μια συνομιλία",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Αποστολή ειδοποίησης email όταν ένα νέο μήνυμα δημιουργείται σε συνομιλία που έχει αναληφθεί"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Αποστολή ειδοποίησης email όταν ένα νέο μήνυμα δημιουργείται σε συνομιλία που έχει αναληφθεί",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Οι προτιμήσεις σας για τις ειδοποιήσεις ενημερώθηκαν",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Να ειδοποιούμαι με push όταν δημιουργείται μια νέα συνομιλία",
         "CONVERSATION_MENTION": "Αποστολή ειδοποιήσεων push όταν αναφέρεστε σε μια συνομιλία",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Αποστολή ειδοποίησης push όταν ένα νέο μήνυμα δημιουργείται σε συνομιλία που έχει αναληφθεί",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Έχετε ενεργοποιήσει τις ειδοποιήσεις push για αυτόν τον browser.",
         "REQUEST_PUSH": "Ενεργοποποίηση των ειδοποιήσεων push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Συζητήσεις",
     "ALL_CONVERSATIONS": "Όλες Οι Συνομιλίες",
     "MENTIONED_CONVERSATIONS": "Αναφορές",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Χωρίς Παρακολούθηση",
     "REPORTS": "Αναφορές",
     "SETTINGS": "Ρυθμίσεις",
@@ -239,6 +242,7 @@
       "DRAFT": "Πρόχειρο",
       "ARCHIVED": "Αρχειοθετημένο",
       "CATEGORY": "Κατηγορία",
+      "SETTINGS": "Ρυθμίσεις",
       "CATEGORY_EMPTY_MESSAGE": "Δεν βρέθηκαν κατηγορίες"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/el/signup.json b/app/javascript/dashboard/i18n/locale/el/signup.json
index 5ecf94255..c610bb125 100644
--- a/app/javascript/dashboard/i18n/locale/el/signup.json
+++ b/app/javascript/dashboard/i18n/locale/el/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Το μόνο που χρειάζεται είναι ένα βήμα για να προχωρήσουμε",
     "TESTIMONIAL_CONTENT": "Είστε ένα βήμα μακριά από την εμπλοκή των πελατών σας, και την εύρεση νέων.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Επωνυμία εταιρείας",
       "PLACEHOLDER": "Εισάγετε το όνομα της εταιρείας σας. π. χ.: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index f8931159a..98417449d 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -35,7 +35,7 @@
     "REMOVE_SELECTION": "Eliminar selección",
     "DOWNLOAD": "Descargar",
     "UNKNOWN_FILE_TYPE": "Archivo desconocido",
-    "SAVE_CONTACT": "Save",
+    "SAVE_CONTACT": "Guardar",
     "UPLOADING_ATTACHMENTS": "Subiendo archivos adjuntos...",
     "SUCCESS_DELETE_MESSAGE": "Mensaje eliminado correctamente",
     "FAIL_DELETE_MESSSAGE": "¡No se pudo eliminar el mensaje! Inténtalo de nuevo",
@@ -135,8 +135,8 @@
         }
       },
       "UNDEFINED_VARIABLES": {
-        "TITLE": "Undefined variables",
-        "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
+        "TITLE": "Variables indefinidas",
+        "MESSAGE": "Tienes {undefinedVariablesCount} variables no definidas en tu mensaje: {undefinedVariables}. ¿Quieres enviar el mensaje de todos modos?",
         "CONFIRM": {
           "YES": "Enviar",
           "CANCEL": "Cancelar"
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copiar",
       "DELETE": "Eliminar",
-      "CREATE_A_CANNED_RESPONSE": "Añadir a respuestas predefinidas"
+      "CREATE_A_CANNED_RESPONSE": "Añadir a respuestas predefinidas",
+      "TRANSLATE": "Traducir"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Asunto"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participar",
+    "SIDEBAR_TITLE": "Participantes de la conversación",
+    "NO_RECORDS_FOUND": "No se encontraron resultados",
+    "ADD_PARTICIPANTS": "Seleccionar participantes",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} más",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} más",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} personas están participando.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} personas están participando.",
+    "NO_PARTICIPANTS_TEXT": "Nadie está participando!.",
+    "WATCH_CONVERSATION": "Abrir conversación",
+    "YOU_ARE_WATCHING": "Estás participando",
+    "API": {
+      "ERROR_MESSAGE": "No se pudo actualizar, ¡inténtelo de nuevo!",
+      "SUCCESS_MESSAGE": "¡Participantes actualizados!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "Ver contenido traducido",
+    "DESC": "Puedes ver el contenido traducido en cada lenguaje.",
+    "ORIGINAL_CONTENT": "Contenido original",
+    "TRANSLATED_CONTENT": "Contenido traducido",
+    "NO_TRANSLATIONS_AVAILABLE": "No hay traducciones disponibles para este contenido"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 0b1e18c70..a83693f8f 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nueva conversación",
       "conversation_assignment": "Conversación asignada",
       "assigned_conversation_new_message": "Nuevo mensaje",
+      "participating_conversation_new_message": "Nuevo mensaje",
       "conversation_mention": "Mención"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/es/helpCenter.json b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
index 25f8585c6..22dbb8c90 100644
--- a/app/javascript/dashboard/i18n/locale/es/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Guardando...",
       "SAVED": "Guardado"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Subir imagen",
+        "UPLOADING": "Subiendo...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Ajustes del artículo",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/es/login.json b/app/javascript/dashboard/i18n/locale/es/login.json
index d4aa6f422..a19bf3983 100644
--- a/app/javascript/dashboard/i18n/locale/es/login.json
+++ b/app/javascript/dashboard/i18n/locale/es/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde",
       "UNAUTH": "Nombre de usuario / Contraseña incorrecto. Inténtelo de nuevo"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Iniciar sesión con Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Por favor, utiliza el correo electrónico de tu empresa para iniciar sesión",
+      "NO_ACCOUNT_FOUND": "No pudimos encontrar una cuenta para tu dirección de correo electrónico."
+    },
     "FORGOT_PASSWORD": "¿Olvidaste tu contraseña?",
     "CREATE_NEW_ACCOUNT": "Crear nueva cuenta",
     "SUBMIT": "Iniciar sesión"
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index fb4dc6c6a..ab3659b1f 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Enviar notificaciones por correo electrónico cuando se me ha asignado una conversación",
         "CONVERSATION_CREATION": "Enviar notificaciones por correo electrónico cuando se crea una nueva conversación",
         "CONVERSATION_MENTION": "Enviar notificaciones por correo electrónico cuando sea mencionado en una conversación",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envirar notificaciones por correo electrónico cuando un nuevo mensaje es creado en una conversación asignada"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envirar notificaciones por correo electrónico cuando un nuevo mensaje es creado en una conversación asignada",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Sus preferencias de notificación se actualizaron correctamente",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Enviar notificaciones push cuando se crea una nueva conversación",
         "CONVERSATION_MENTION": "Enviar notificaciones push cuando sea mencionado en una conversación",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar notificaciones push cuando un nuevo mensaja es creadao en una conversación asignada",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Ha habilitado notificaciones push para este navegador.",
         "REQUEST_PUSH": "Habilitar notificaciones push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversaciones",
     "ALL_CONVERSATIONS": "Todas las conversaciones",
     "MENTIONED_CONVERSATIONS": "Menciones",
+    "PARTICIPATING_CONVERSATIONS": "Participar",
     "UNATTENDED_CONVERSATIONS": "Desatendido",
     "REPORTS": "Informes",
     "SETTINGS": "Ajustes",
@@ -239,6 +242,7 @@
       "DRAFT": "Borrador",
       "ARCHIVED": "Archivado",
       "CATEGORY": "Categoría",
+      "SETTINGS": "Ajustes",
       "CATEGORY_EMPTY_MESSAGE": "No se encontraron categorías"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/es/signup.json b/app/javascript/dashboard/i18n/locale/es/signup.json
index 056a48c7b..38b91dd36 100644
--- a/app/javascript/dashboard/i18n/locale/es/signup.json
+++ b/app/javascript/dashboard/i18n/locale/es/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Todo lo que se necesita es un paso adelante",
     "TESTIMONIAL_CONTENT": "Usted está a un paso de involucrar a sus clientes, conservarlos y encontrar nuevos.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Nombre de la empresa",
       "PLACEHOLDER": "Introduce el nombre de tu empresa, por ejemplo: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
index 7f94a0428..fd0e60e07 100644
--- a/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
@@ -5,7 +5,7 @@
     "LOADING": "دریافت لیست ایجنت ها",
     "SIDEBAR_TXT": "<p><b>ایجنت ها</b></p>\n <p> یک <b>ایجنت</b> یکی از اعضای تیم پشتیبانی است. </p><p> ایجنت ها می‌توانند پیام‌های کاربران را ببینند و به آن‌ها پاسخ بدهند. این لیست حاوی تمام اپراتورهایی است که در حساب شما تعریف شده اند. </p><p> با زدن روی دکمه <b>اضافه کردن اپراتور</b> می‌توانید یک اپراتور جدید معرفی کنید. به ایمیل اپراتوری که معرفی می‌کنید یک دعوتنامه ارسال می‌شود که بعد از پذیرفتن آن ایجنت می‌تواند به پیام‌های کاربران پاسخ بدهد. </p><p> بسته به سطح دسترسی تعیین شده یک اپراتور می‌تواند به بخش‌های مشخصی از اکانت دسترسی پیدا کند </p><p> <b>اپراتور</b> - اپراتورهایی که این نقش را داشته باشند تنها می‌توانند به صندوق‌های ورودی، گزارشات و گفتگوها دسترسی داشته باشند. آن‌ها می‌توانند یک مکالمه را به اپراتور دیگر یا خودشان تخصیص دهند و یا یک مکالمه را حل شده اعلام کنند.</p><p> <b>مدیر</b> - مدیران می‌توانند علاوه بر تمام بخش‌هایی که یک اپراتور دسترسی دارد، به تمام بخش‌هایی که در حساب کاربری شما وجود دارد دسترسی داشته باشند.</p>",
     "AGENT_TYPES": {
-      "ADMINISTRATOR": "مدیر",
+      "ADMINISTRATOR": "مدیرکل",
       "AGENT": "ایجنت"
     },
     "LIST": {
@@ -29,9 +29,9 @@
           "PLACEHOLDER": "لطفا اسم ایجنت را وارد نمایید"
         },
         "AGENT_TYPE": {
-          "LABEL": "نوع ایجنت",
-          "PLACEHOLDER": "لطفا نوع دسترسی ایجنت را مشخص کنید",
-          "ERROR": "تعیین کردن نوع ایجنت الزامی است"
+          "LABEL": "نقش",
+          "PLACEHOLDER": "لطفا نقشی را انتخاب کنید",
+          "ERROR": "نقش ضروری است"
         },
         "EMAIL": {
           "LABEL": "ایمیل",
@@ -55,7 +55,7 @@
         "TITLE": "تاییدیه حذف",
         "MESSAGE": "مطمئن هستید که حذف شود ",
         "YES": "بله، حذف شود ",
-        "NO": "نه، بماند "
+        "NO": "خیر، نگه‌دار "
       }
     },
     "EDIT": {
@@ -66,9 +66,9 @@
           "PLACEHOLDER": "لطفا اسم ایجنت را وارد کنید"
         },
         "AGENT_TYPE": {
-          "LABEL": "نوع ایجنت",
-          "PLACEHOLDER": "لطفا نوع ایجنت را انتخاب کنید",
-          "ERROR": "تعیین کردن نوع ایجنت الزامی است"
+          "LABEL": "نقش",
+          "PLACEHOLDER": "لطفا نقشی را انتخاب کنید",
+          "ERROR": "نقش ضروری است"
         },
         "EMAIL": {
           "LABEL": "ایمیل",
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 95966657f..cae027c34 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -136,7 +136,7 @@
       },
       "UNDEFINED_VARIABLES": {
         "TITLE": "متغیرهای تعریف نشده",
-        "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
+        "MESSAGE": "شما در پیام خود {undefinedVariablesCount} متغیر تعریف نشده دارید: {undefinedVariables}. آیا به هر حال می خواهید پیام را ارسال کنید؟",
         "CONFIRM": {
           "YES": "ارسال",
           "CANCEL": "انصراف"
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "کپی",
       "DELETE": "حذف",
-      "CREATE_A_CANNED_RESPONSE": "اضافه کردن به پاسخ‌های آماده"
+      "CREATE_A_CANNED_RESPONSE": "اضافه کردن به پاسخ‌های آماده",
+      "TRANSLATE": "ترجمه"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "موضوع"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "شرکت کننده",
+    "SIDEBAR_TITLE": "شرکت کنندگان در گفتگو",
+    "NO_RECORDS_FOUND": "نتیجه‌ای یافت نشد",
+    "ADD_PARTICIPANTS": "شرکت کنندگان را انتخاب کنید",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} نفر دیگر",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} دیگر",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} نفر شرکت می کنند.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} نفر شرکت می کند.",
+    "NO_PARTICIPANTS_TEXT": "هیچ کس شرکت نمی کند!.",
+    "WATCH_CONVERSATION": "به گفتگو بپیوندید",
+    "YOU_ARE_WATCHING": "شما شرکت می کنید",
+    "API": {
+      "ERROR_MESSAGE": "به روز رسانی نشد، دوباره امتحان کنید!",
+      "SUCCESS_MESSAGE": "شرکت کنندگان به روز شدند!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "مشاهده محتوای ترجمه شده",
+    "DESC": "می‌توانید محتوای ترجمه شده را به هر زبان مشاهده کنید.",
+    "ORIGINAL_CONTENT": "محتوای اصلی",
+    "TRANSLATED_CONTENT": "مطالب ترجمه شده",
+    "NO_TRANSLATIONS_AVAILABLE": "هیچ ترجمه‌ای برای این مطلب موجود نیست"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 39d17bb04..8156a063d 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "گفتگوی جدید",
       "conversation_assignment": "مکالمه اختصاص داده شد",
       "assigned_conversation_new_message": "پیام جدید",
+      "participating_conversation_new_message": "پیام جدید",
       "conversation_mention": "اشاره"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
index dac4c548f..8e0815ecc 100644
--- a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "در حال ذخیره...",
       "SAVED": "ذخیره شد"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "آپلود عکس",
+        "UPLOADING": "در حال آپلود...",
+        "SUCCESS": "تصویر با موفقیت آپلود شد",
+        "ERROR": "خطا هنگام آپلود تصویر",
+        "ERROR_FILE_SIZE": "اندازه تصویر باید کمتر از {size} مگابایت باشد",
+        "ERROR_FILE_FORMAT": "فرمت تصویر باید jpg، jpeg یا png باشد",
+        "ERROR_FILE_DIMENSIONS": "ابعاد تصویر باید کمتر از 2000*2000 باشد"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "تنظیمات مقاله",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 51436f1c7..54420ce7a 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -347,14 +347,14 @@
       },
       "EMAIL_PROVIDER": {
         "TITLE": "ارائه دهنده ایمیل خود را انتخاب کنید",
-        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+        "DESCRIPTION": "یک ارائه دهنده ایمیل از لیست زیر انتخاب کنید. اگر ارائه دهنده ایمیل خود را در لیست نمی بینید، می توانید گزینه ارائه دهنده دیگر را انتخاب کنید و اعتبارنامه IMAP و SMTP را ارائه دهید."
       },
       "MICROSOFT": {
         "TITLE": "ایمیل مایکروسافت",
-        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
+        "DESCRIPTION": "برای شروع روی دکمه Sign in with Microsoft کلیک کنید. شما به صفحه ورود به ایمیل هدایت خواهید شد. هنگامی که مجوزهای درخواستی را پذیرفتید، به مرحله ایجاد صندوق ورودی هدایت می شوید.",
         "EMAIL_PLACEHOLDER": "آدرس ایمیل را وارد کنید",
-        "HELP": "To add your Microsoft account as a channel, you need to authenticate your Microsoft account by clicking on 'Sign in with Microsoft' ",
-        "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
+        "HELP": "برای افزودن حساب مایکروسافت خود به عنوان کانال، باید با کلیک بر روی \"ورود به سیستم با مایکروسافت\" اکانت مایکروسافت خود را احراز هویت کنید.",
+        "ERROR_MESSAGE": "هنگام اتصال به مایکروسافت خطایی روی داد، لطفاً دوباره امتحان کنید"
       }
     },
     "DETAILS": {
@@ -472,10 +472,10 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "اجازه دادن به پیام ها پس از حل شدن مکالمه",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "به کاربران اجازه دهید حتی پس از حل شدن مکالمه پیام ارسال کنند.",
       "WHATSAPP_SECTION_SUBHEADER": "این کلید API برای ادغام با API های WhatsApp استفاده می شود.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "کلید به روز شده را وارد کنید تا از آن برای ادغام با واتساپ API استفاده شود.",
       "WHATSAPP_SECTION_TITLE": "API key",
-      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
-      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "کلید API را به روز کنید",
+      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "کلید API جدید را در اینجا وارد کنید",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "اعمال شود"
     },
     "AUTO_ASSIGNMENT": {
@@ -565,7 +565,7 @@
     },
     "MICROSOFT": {
       "TITLE": "مایکروسافت",
-      "SUBTITLE": "Reauthorize your MICROSOFT account"
+      "SUBTITLE": "حساب مایکروسافت خود را مجدداً تأیید کنید"
     },
     "SMTP": {
       "TITLE": "SMTP",
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 0af60bb5c..5f41d1164 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -80,10 +80,10 @@
     },
     "DYTE": {
       "CLICK_HERE_TO_JOIN": "برای عضویت اینجا را کلیک کنید",
-      "LEAVE_THE_ROOM": "Leave the room",
-      "START_VIDEO_CALL_HELP_TEXT": "Start a new video call with the customer",
-      "JOIN_ERROR": "There was an error joining the call, please try again",
-      "CREATE_ERROR": "There was an error creating a meeting link, please try again"
+      "LEAVE_THE_ROOM": "اتاق را ترک کن",
+      "START_VIDEO_CALL_HELP_TEXT": "یک تماس ویدیویی جدید با مشتری شروع کنید",
+      "JOIN_ERROR": "هنگام پیوستن به تماس خطایی روی داد، لطفاً دوباره امتحان کنید",
+      "CREATE_ERROR": "در ایجاد پیوند جلسه خطایی روی داد، لطفاً دوباره امتحان کنید"
     },
     "DELETE": {
       "BUTTON_TEXT": "حذف",
diff --git a/app/javascript/dashboard/i18n/locale/fa/login.json b/app/javascript/dashboard/i18n/locale/fa/login.json
index 94f1e5ce9..0d75f9b03 100644
--- a/app/javascript/dashboard/i18n/locale/fa/login.json
+++ b/app/javascript/dashboard/i18n/locale/fa/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید",
       "UNAUTH": "این نام کاربری و رمز عبور صحیح نیست"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "با گوگل وارد شوید",
+      "BUSINESS_ACCOUNTS_ONLY": "لطفا از آدرس ایمیل شرکت خود برای ورود استفاده کنید",
+      "NO_ACCOUNT_FOUND": "ما نتوانستیم حسابی برای آدرس ایمیل شما پیدا کنیم."
+    },
     "FORGOT_PASSWORD": "رمز عبورتان را فراموش کردید؟",
     "CREATE_NEW_ACCOUNT": "حساب جدید بسازید",
     "SUBMIT": "ورود"
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index ed6b7a527..52958e7eb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -65,12 +65,12 @@
           "ALL_CONVERSATIONS": "همه گفتگوها"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "صدای هشدار:"
         },
         "CONDITIONS": {
           "TITLE": "شرط‌های هشدار:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
-          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+          "CONDITION_ONE": "فقط در صورتی که پنجره مرورگر فعال نباشد، هشدارهای صوتی را ارسال کنید",
+          "CONDITION_TWO": "هر 30 ثانیه یک بار هشدار ارسال کنید تا زمانی که تمام مکالمات اختصاص داده شده خوانده شود"
         }
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "هر وقت گفتگویی به من اختصاص داده شد،‌ ایمیل بفرست",
         "CONVERSATION_CREATION": "هر وقت گفتگوی جدیدی شروع شد برای من ایمیل بفرست",
         "CONVERSATION_MENTION": "هنگامی که از شما در گفتگو نام برده می‌شود، از طریق ایمیل آگاه‌سازی ارسال کن",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "با ایجاد پیام جدید در مکالمه اختصاصی ، اعلان های ایمیل را ارسال کنید"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "با ایجاد پیام جدید در مکالمه اختصاصی ، اعلان های ایمیل را ارسال کنید",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "هنگامی که یک پیام جدید در یک مکالمه شرکت کننده ایجاد می شود، اعلان های ایمیل ارسال کنید"
       },
       "API": {
         "UPDATE_SUCCESS": "تغییرات تنظیمات اعلامیه‌ها با موفقیت ثبت شد",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "هر وقت گفتگوی جدیدی شروع شد برای من پوش نوتیفیکیشن بفرست",
         "CONVERSATION_MENTION": "هنگامی که از شما در مکالمه نام برده می شود پوش نوتیفیکیشن ارسال کنید",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "وقتی پیام جدیدی در مکالمه اختصاص داده شده ایجاد می شود ، پوش نوتیفیکیشن را ارسال کنید",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "هنگامی که یک پیام جدید در یک مکالمه شرکت کننده ایجاد می شود، اعلان فشار ارسال کنید",
         "HAS_ENABLED_PUSH": "در این مرورگر پوش نوتیفیکیشن را فعال کرده‌اید",
         "REQUEST_PUSH": "فعال کردن پوش نوتیفیکیشن"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "گفتگوها",
     "ALL_CONVERSATIONS": "همه گفتگوها",
     "MENTIONED_CONVERSATIONS": "اشاره",
+    "PARTICIPATING_CONVERSATIONS": "شرکت کننده",
     "UNATTENDED_CONVERSATIONS": "بی سرپرست",
     "REPORTS": "گزارشات",
     "SETTINGS": "تنظیمات",
@@ -239,6 +242,7 @@
       "DRAFT": "پیش‌نویس",
       "ARCHIVED": "بایگانی شد",
       "CATEGORY": "دسته‌بندی",
+      "SETTINGS": "تنظیمات",
       "CATEGORY_EMPTY_MESSAGE": "هیچ دسته‌بندی‌ای یافت نشد"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/signup.json b/app/javascript/dashboard/i18n/locale/fa/signup.json
index e406b97c8..fef19a0cb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fa/signup.json
@@ -4,7 +4,10 @@
     "TITLE": "ثبت نام",
     "TESTIMONIAL_HEADER": "تنها چیزی که لازم است یک قدم برای حرکت به جلو است",
     "TESTIMONIAL_CONTENT": "شما یک قدم تا جذب مشتریان خود، حفظ آنها و یافتن مشتریان جدید فاصله دارید.",
-    "TERMS_ACCEPT": "By creating an account, 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>",
+    "TERMS_ACCEPT": "با ایجاد یک حساب کاربری، با <a href=\"https://www.chatwoot.com/terms\">T & C</a> و <a href=\"https://www.chatwoot.com/ ما موافقت می کنید privacy-policy\">خط مشی رازداری</a>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "با گوگل ثبت نام کنید"
+    },
     "COMPANY_NAME": {
       "LABEL": "نام شرکت",
       "PLACEHOLDER": "نام شرکت خود را وارد کنید. به عنوان مثال: شرکت وین",
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 6bdbfa869..d3a1d7e20 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopioi",
       "DELETE": "Poista",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index 688ebaee4..b3a129d25 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Uusi keskustelu",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
index 5364291ef..599392b98 100644
--- a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Lataa kuva",
+        "UPLOADING": "Lähetetään...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/login.json b/app/javascript/dashboard/i18n/locale/fi/login.json
index 8cf16346f..c807d305a 100644
--- a/app/javascript/dashboard/i18n/locale/fi/login.json
+++ b/app/javascript/dashboard/i18n/locale/fi/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen",
       "UNAUTH": "Käyttäjätunnus / salasana virheellinen. Yritä uudelleen"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Salasana unohtunut?",
     "CREATE_NEW_ACCOUNT": "Luo uusi tili",
     "SUBMIT": "Kirjaudu"
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 43d5d9433..da4f75285 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Lähetä sähköposti-ilmoitus, kun keskustelu on määritetty minulle",
         "CONVERSATION_CREATION": "Lähetä sähköposti-ilmoitus, kun keskustelu on määritetty minulle",
         "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Lähetä sähköposti-ilmoitus, kun uusi viesti saapuu minulle osoitettuun keskusteluun"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Lähetä sähköposti-ilmoitus, kun uusi viesti saapuu minulle osoitettuun keskusteluun",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Ilmoitusasetuksesi päivitetään onnistuneesti",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Lähetä push-ilmoitus, kun keskustelu on määritetty minulle",
         "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Lähetä push-ilmoitus, kun uusi viesti saapuu minulle osoitettuun keskusteluun",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Tämän selaimen push-ilmoitukset on otettu käyttöön.",
         "REQUEST_PUSH": "Ota push-ilmoitukset käyttöön"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Keskustelut",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Raportit",
     "SETTINGS": "Asetukset",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Asetukset",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/signup.json b/app/javascript/dashboard/i18n/locale/fi/signup.json
index 86db9252b..717809d30 100644
--- a/app/javascript/dashboard/i18n/locale/fi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fi/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index d5bb80d84..e3b4ee4be 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copier",
       "DELETE": "Supprimer",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Cci",
     "CC": "Cc",
     "SUBJECT": "Objet"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Aucun résultat trouvé",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index 2b7e0cc2b..8c7109402 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nouvelle conversation",
       "conversation_assignment": "Conversation assignée",
       "assigned_conversation_new_message": "Nouveau message",
+      "participating_conversation_new_message": "Nouveau message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
index 49d2eea6f..6b0793625 100644
--- a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Téléverser une image",
+        "UPLOADING": "Téléversement...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/login.json b/app/javascript/dashboard/i18n/locale/fr/login.json
index fbd431e11..68d3d47b3 100644
--- a/app/javascript/dashboard/i18n/locale/fr/login.json
+++ b/app/javascript/dashboard/i18n/locale/fr/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard",
       "UNAUTH": "Nom d'utilisateur / Mot de passe incorrect. Veuillez réessayer"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Mot de passe oublié ?",
     "CREATE_NEW_ACCOUNT": "Créer un nouveau compte",
     "SUBMIT": "Se connecter"
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index a698a3527..5695ef2cb 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Envoyer des notifications par courriel lorsqu'une conversation m'est assignée",
         "CONVERSATION_CREATION": "Envoyer des notifications par courriel quand une nouvelle conversation est créée",
         "CONVERSATION_MENTION": "Envoyer des notifications par courriel lorsque vous êtes mentionné dans une conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envoyer des notifications par courriel lorsqu'un nouveau message est créé dans une conversation assignée"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envoyer des notifications par courriel lorsqu'un nouveau message est créé dans une conversation assignée",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Vos préférences de notifications ont été mises à jour avec succès",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Envoyer des notifications push quand une nouvelle conversation est créée",
         "CONVERSATION_MENTION": "Envoyer des notifications push lorsque vous êtes mentionné dans une conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envoyer des notifications push lorsqu'un nouveau message est créé dans une conversation assignée",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Vous avez activé les notifications pour ce navigateur.",
         "REQUEST_PUSH": "Activer les notifications push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "Toutes les conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Sans suivi",
     "REPORTS": "Rapports",
     "SETTINGS": "Paramètres",
@@ -239,6 +242,7 @@
       "DRAFT": "Brouillon",
       "ARCHIVED": "Archivé",
       "CATEGORY": "Catégorie",
+      "SETTINGS": "Paramètres",
       "CATEGORY_EMPTY_MESSAGE": "Aucune catégorie trouvée"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/signup.json b/app/javascript/dashboard/i18n/locale/fr/signup.json
index 0d91ef9cd..81e4fd50f 100644
--- a/app/javascript/dashboard/i18n/locale/fr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fr/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Il suffit d'une étape pour avancer",
     "TESTIMONIAL_CONTENT": "Vous n'êtes plus qu'à un pas d'engager vos clients, de les fidéliser et d'en trouver de nouveaux.",
     "TERMS_ACCEPT": "En créant un compte, vous acceptez nos <a href=\"https://www.chatwoot.com/terms\">CGU</a> et notre <a href=\"https://www.chatwoot.com/privacy-policy\">Politique de confidentialité</a>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Nom de la société",
       "PLACEHOLDER": "Entrez le nom de votre entreprise. Ex : Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 9b73b1727..ff8c2b36c 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "העתק",
       "DELETE": "מחק",
-      "CREATE_A_CANNED_RESPONSE": "הוסף לתגובות מוכנות"
+      "CREATE_A_CANNED_RESPONSE": "הוסף לתגובות מוכנות",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "עותק",
     "SUBJECT": "נושא"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "לא נמצאו תוצאות",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 0401e3447..2aad9ac69 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "שיחה חדשה",
       "conversation_assignment": "שיחה הוקצתה",
       "assigned_conversation_new_message": "הודעה חדשה",
+      "participating_conversation_new_message": "הודעה חדשה",
       "conversation_mention": "אִזְכּוּר"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/he/helpCenter.json b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
index 1b667d591..20ae02725 100644
--- a/app/javascript/dashboard/i18n/locale/he/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "מעלה...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/he/login.json b/app/javascript/dashboard/i18n/locale/he/login.json
index 453121796..617718944 100644
--- a/app/javascript/dashboard/i18n/locale/he/login.json
+++ b/app/javascript/dashboard/i18n/locale/he/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר",
       "UNAUTH": "שם משתמש / סיסמה שגויים. נסה שוב"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "שכחת את הסיסמה?",
     "CREATE_NEW_ACCOUNT": "צור חשבון",
     "SUBMIT": "התחבר"
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index d634b89df..21ed0ccef 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "שלח התראה באימייל כאשר שיחה מוקצית עבורי",
         "CONVERSATION_CREATION": "שלח התראה באימייל כאשר נפתחת שיחה חדשה",
         "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "שלח התראה באימייל כאשר יש הודעה חדשה בשיחה המוקצית עבורי"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "שלח התראה באימייל כאשר יש הודעה חדשה בשיחה המוקצית עבורי",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "שלח התראת פוש כאשר נפתחת שיחה חדשה",
         "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "שלח התראת פוש כאשר יש הודעה חדשה בשיחה המוקצית עבורי",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "שיחות",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "אִזְכּוּרים",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "הגדרות",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "הגדרות",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/he/signup.json b/app/javascript/dashboard/i18n/locale/he/signup.json
index 3c6168972..489fafb53 100644
--- a/app/javascript/dashboard/i18n/locale/he/signup.json
+++ b/app/javascript/dashboard/i18n/locale/he/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index b483d239f..f98a3cdc0 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Delete",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index f1d87ee73..367b35b1c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
index fa1ba638a..621a16ae8 100644
--- a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Uploading...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/login.json b/app/javascript/dashboard/i18n/locale/hi/login.json
index 30f667052..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/hi/login.json
+++ b/app/javascript/dashboard/i18n/locale/hi/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 4c9ef685f..6e6a8b675 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/signup.json b/app/javascript/dashboard/i18n/locale/hi/signup.json
index 8defb3133..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/hi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hi/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index a1912a744..29ba6334e 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Másolás",
       "DELETE": "Törlés",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Nincs találat",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 68b2ce234..dc5853700 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Új beszélgetés",
       "conversation_assignment": "Beszélgetés hozzárendelve",
       "assigned_conversation_new_message": "Új üzenet",
+      "participating_conversation_new_message": "Új üzenet",
       "conversation_mention": "Megemlítés"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
index bddec866d..146a7380b 100644
--- a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Kép feltöltése",
+        "UPLOADING": "Frissítés...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/login.json b/app/javascript/dashboard/i18n/locale/hu/login.json
index b7b89e493..c99045ffd 100644
--- a/app/javascript/dashboard/i18n/locale/hu/login.json
+++ b/app/javascript/dashboard/i18n/locale/hu/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később",
       "UNAUTH": "A felhasználó / jelszó helytelen. Kérjük próbálja újra"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Elfelejtetted a jelszavad?",
     "CREATE_NEW_ACCOUNT": "Új fiók létrehozása",
     "SUBMIT": "Bejelentkezés"
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index e10c4ba65..7a931f6a5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Küldj e-mail értesítéseket, amikor a beszélgetést hozzám rendelik",
         "CONVERSATION_CREATION": "Küldj e-mail értesítéseket, amikor egy új beszélgetés létrejön",
         "CONVERSATION_MENTION": "Küldj e-mail értesítéseket, amikor egy beszélgetésben megemlítenek",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Küldj e-mail értesítéseket, amikor egy hozzám rendelt beszélgetésben új üzenet érkezik"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Küldj e-mail értesítéseket, amikor egy hozzám rendelt beszélgetésben új üzenet érkezik",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Az értesítési beállításaid sikeresen frissítve",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Küldj push üzeneteket, amikor egy új beszélgetés létrejön",
         "CONVERSATION_MENTION": "Küldj push üzeneteket, amikor egy beszélgetésben megemlítenek",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Küldj push üzeneteket, amikor egy hozzám rendelt beszélgetésben új üzenet érkezik",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Engedélyezted a push üzeneteket ezen a böngészőn.",
         "REQUEST_PUSH": "Push üznetek engedélyezése"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Beszélgetések",
     "ALL_CONVERSATIONS": "Beszélgetések",
     "MENTIONED_CONVERSATIONS": "Megemlítések",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Jelentések",
     "SETTINGS": "Beállítások",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Beállítások",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/signup.json b/app/javascript/dashboard/i18n/locale/hu/signup.json
index 6a47945c1..13453510b 100644
--- a/app/javascript/dashboard/i18n/locale/hu/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hu/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 3273050c9..9368650ba 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Salin",
       "DELETE": "Hapus",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Tidak ada hasil ditemukan",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index b6f83c55d..54d582e08 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Percakapan baru",
       "conversation_assignment": "Percakapan ditugaskan",
       "assigned_conversation_new_message": "Pesan Baru",
+      "participating_conversation_new_message": "Pesan Baru",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/id/helpCenter.json b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
index e50598e1a..c57fd27dc 100644
--- a/app/javascript/dashboard/i18n/locale/id/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Unggah Gambar",
+        "UPLOADING": "Mengunggah...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/id/login.json b/app/javascript/dashboard/i18n/locale/id/login.json
index 503291ad4..b9d216d61 100644
--- a/app/javascript/dashboard/i18n/locale/id/login.json
+++ b/app/javascript/dashboard/i18n/locale/id/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti",
       "UNAUTH": "Nama Pengguna / Kata Sandi Salah. Silahkan coba lagi"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Lupa kata sandi Anda?",
     "CREATE_NEW_ACCOUNT": "Buat akun baru",
     "SUBMIT": "Masuk"
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 933ef7925..98c754aee 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Kirim pemberitahuan email saat percakapan ditugaskan kepada saya",
         "CONVERSATION_CREATION": "Kirim pemberitahuan email ketika percakapan baru dibuat",
         "CONVERSATION_MENTION": "Kirim pemberitahuan email saat Anda disebut dalam percakapan",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Kirim pemberitahuan email ketika pesan baru dibuat dalam percakapan yang telah ditugaskan"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Kirim pemberitahuan email ketika pesan baru dibuat dalam percakapan yang telah ditugaskan",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Preferensi pemberitahuan Anda berhasil diperbarui",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Kirim push notification ketika percakapan baru dibuat",
         "CONVERSATION_MENTION": "Kirim push notification ketika Anda disebut dalam percakapan",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Kirim push notification ketika pesan baru dibuat dalam percakapan yang telah ditugaskan",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Anda telah mengaktifkan push notification untuk browser ini.",
         "REQUEST_PUSH": "Aktifkan push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Percakapan",
     "ALL_CONVERSATIONS": "Semua Percakapan",
     "MENTIONED_CONVERSATIONS": "Sebutkan",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Laporan",
     "SETTINGS": "Pengaturan",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Pengaturan",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/id/signup.json b/app/javascript/dashboard/i18n/locale/id/signup.json
index 481131e1d..3253f778a 100644
--- a/app/javascript/dashboard/i18n/locale/id/signup.json
+++ b/app/javascript/dashboard/i18n/locale/id/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/is/conversation.json b/app/javascript/dashboard/i18n/locale/is/conversation.json
index 648d32078..c8abdbc22 100644
--- a/app/javascript/dashboard/i18n/locale/is/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/is/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Afrita",
       "DELETE": "Eyða",
-      "CREATE_A_CANNED_RESPONSE": "Bæta við stöðluðu svari"
+      "CREATE_A_CANNED_RESPONSE": "Bæta við stöðluðu svari",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Engar niðurstöður fundust",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index 016ff0eaa..ea1ff86a2 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nýtt samtal",
       "conversation_assignment": "Samtali úthlutað",
       "assigned_conversation_new_message": "Nýtt skilaboð",
+      "participating_conversation_new_message": "Nýtt skilaboð",
       "conversation_mention": "Nefna"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/is/helpCenter.json b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
index 73d9e2bdf..c32cd653d 100644
--- a/app/javascript/dashboard/i18n/locale/is/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Hleður upp...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/is/login.json b/app/javascript/dashboard/i18n/locale/is/login.json
index 8ce5267d8..06cd997da 100644
--- a/app/javascript/dashboard/i18n/locale/is/login.json
+++ b/app/javascript/dashboard/i18n/locale/is/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur",
       "UNAUTH": "Notandanafn / lykilorð rangt. Vinsamlegast reyndu aftur"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Gleymt lykilorð?",
     "CREATE_NEW_ACCOUNT": "Stofna nýjan aðgang",
     "SUBMIT": "Innskráning"
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index 15e8288e0..014389e1d 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Senda tilkynningar í tölvupósti þegar mér er úthlutað samtali",
         "CONVERSATION_CREATION": "Senda tilkynningar í tölvupósti þegar nýtt samtal er stofnað",
         "CONVERSATION_MENTION": "Sendu tilkynningar í tölvupósti þegar minnst er á þig í samtali",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Sendu tilkynningar í tölvupósti þegar ný skilaboð eru búin til í úthlutuðu samtali"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Sendu tilkynningar í tölvupósti þegar ný skilaboð eru búin til í úthlutuðu samtali",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Tilkynningarstillingarnar þínar hafa verið uppfærðar",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Senda þrýstitilkynningar þegar nýtt samtal er stofnað",
         "CONVERSATION_MENTION": "Sendu þrýstitilkynningar þegar minnst er á þig í samtali",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Sendu push tilkynningar þegar ný skilaboð eru búin til í úthlutuðu samtali",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Samtöl",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Stillingar",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Stillingar",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/is/signup.json b/app/javascript/dashboard/i18n/locale/is/signup.json
index 30ef74ea5..7aeb485eb 100644
--- a/app/javascript/dashboard/i18n/locale/is/signup.json
+++ b/app/javascript/dashboard/i18n/locale/is/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Það þarf aðeins eitt skref framávið",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Nafn fyrirtækis",
       "PLACEHOLDER": "Sláðu inn nafn fyrirtækisins þíns. Dæmi: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index 9e9487815..1b9a8bf3d 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copia",
       "DELETE": "Elimina",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "CCN",
     "CC": "Cc",
     "SUBJECT": "Oggetto"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Nessun risultato trovato",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index 50b8035a5..7ac365a8b 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nuova conversazione",
       "conversation_assignment": "Conversazione assegnata",
       "assigned_conversation_new_message": "Nuovo messaggio",
+      "participating_conversation_new_message": "Nuovo messaggio",
       "conversation_mention": "Menzione"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index b85031ee2..4782525dc 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Salvataggio...",
       "SAVED": "Salvato"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Carica immagine",
+        "UPLOADING": "Caricamento...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Impostazioni articolo",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/it/login.json b/app/javascript/dashboard/i18n/locale/it/login.json
index 441259382..a4d43ed0b 100644
--- a/app/javascript/dashboard/i18n/locale/it/login.json
+++ b/app/javascript/dashboard/i18n/locale/it/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi",
       "UNAUTH": "Nome utente / Password errati. Riprova"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Password dimenticata?",
     "CREATE_NEW_ACCOUNT": "Crea un nuovo account",
     "SUBMIT": "Accedi"
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index bcfa7ed2e..c0b6ae5b7 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -79,7 +79,8 @@
         "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 email 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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Le preferenze per le notifiche sono state aggiornate con successo",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Invia notifiche push quando una conversazione mi viene assegnata",
         "CONVERSATION_MENTION": "Invia notifiche push quando sei menzionato in una conversazione",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Invia notifiche push quando viene creato un nuovo messaggio in una conversazione assegnata",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Hai abilitato notifiche push per questo browser.",
         "REQUEST_PUSH": "Abilita notifiche push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversazioni",
     "ALL_CONVERSATIONS": "Tutte le conversazioni",
     "MENTIONED_CONVERSATIONS": "Menzioni",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Non partecipate",
     "REPORTS": "Segnalazioni",
     "SETTINGS": "Impostazioni",
@@ -239,6 +242,7 @@
       "DRAFT": "Bozza",
       "ARCHIVED": "Archiviato",
       "CATEGORY": "Categoria",
+      "SETTINGS": "Impostazioni",
       "CATEGORY_EMPTY_MESSAGE": "Nessuna categoria trovata"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/it/signup.json b/app/javascript/dashboard/i18n/locale/it/signup.json
index a7e080059..b230554ee 100644
--- a/app/javascript/dashboard/i18n/locale/it/signup.json
+++ b/app/javascript/dashboard/i18n/locale/it/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 4dd27e18d..2e96432e2 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "コピー",
       "DELETE": "削除",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "ビーシーシー",
     "CC": "シーシー",
     "SUBJECT": "件名"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 8d8d70ab4..194d79dad 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
index 623b9022c..5d1acaf0d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "画像をアップロード",
+        "UPLOADING": "アップロード中...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/login.json b/app/javascript/dashboard/i18n/locale/ja/login.json
index 3e2c8cc47..c2116ab5e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/login.json
+++ b/app/javascript/dashboard/i18n/locale/ja/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。",
       "UNAUTH": "ユーザー名/パスワードが正しくありません。もう一度やり直してください"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "パスワードをお忘れですか?",
     "CREATE_NEW_ACCOUNT": "新しいアカウントを作成",
     "SUBMIT": "ログイン"
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index cb50630e1..50a017381 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "会話が自分に割り当てられたときにメールで通知を送信する",
         "CONVERSATION_CREATION": "新しい会話が作成されたときにメールで通知を送信する",
         "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "割り当てられた会話で新しいメッセージが作成されたときにメールで通知を送信します"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "割り当てられた会話で新しいメッセージが作成されたときにメールで通知を送信します",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "通知設定が正常に更新されました",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "新しい会話が作成されたときにプッシュ通知を送信する",
         "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "割り当てられた会話で新しいメッセージが作成されたときにプッシュ通知を送信する",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "このブラウザーでプッシュ通知を有効にしました。",
         "REQUEST_PUSH": "プッシュ通知を有効にする"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "会話データ",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "レポート",
     "SETTINGS": "設定",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "設定",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/signup.json b/app/javascript/dashboard/i18n/locale/ja/signup.json
index dac9ddc30..26461ba8e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ja/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ka/conversation.json b/app/javascript/dashboard/i18n/locale/ka/conversation.json
index b483d239f..f98a3cdc0 100644
--- a/app/javascript/dashboard/i18n/locale/ka/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ka/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Delete",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index f1d87ee73..367b35b1c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
index fa1ba638a..621a16ae8 100644
--- a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Uploading...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/login.json b/app/javascript/dashboard/i18n/locale/ka/login.json
index 30f667052..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/ka/login.json
+++ b/app/javascript/dashboard/i18n/locale/ka/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index 4c9ef685f..6e6a8b675 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/signup.json b/app/javascript/dashboard/i18n/locale/ka/signup.json
index 8defb3133..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/ka/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ka/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index 0c3124a34..29ae723f7 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "복사",
       "DELETE": "삭제",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "검색 결과가 없습니다",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 9454f17b2..dd08c70ee 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "새 대화",
       "conversation_assignment": "대화 할당됨",
       "assigned_conversation_new_message": "새 메시지",
+      "participating_conversation_new_message": "새 메시지",
       "conversation_mention": "멘션"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
index 50c0879e9..8b9d267f5 100644
--- a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "이미지 업로드",
+        "UPLOADING": "업로드 중...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/login.json b/app/javascript/dashboard/i18n/locale/ko/login.json
index d48856863..830ab769f 100644
--- a/app/javascript/dashboard/i18n/locale/ko/login.json
+++ b/app/javascript/dashboard/i18n/locale/ko/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오.",
       "UNAUTH": "사용자 이름/암호가 잘못됨. 다시 시도하십시오."
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "암호를 잊으셨나요?",
     "CREATE_NEW_ACCOUNT": "계정 생성",
     "SUBMIT": "로그인"
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 265feb61d..d297ba87c 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "대화가 할당될 때 이메일 알림 보내기",
         "CONVERSATION_CREATION": "새 대화가 생성될 때 이메일 알림 보내기",
         "CONVERSATION_MENTION": "대화에서 멘션될 때 이메일 알림 보내기",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "할당된 대화에서 새 메시지가 생성될 때 이메일 알림 보내기"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "할당된 대화에서 새 메시지가 생성될 때 이메일 알림 보내기",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "알림 기본 설정이 성공적으로 업데이트됨",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "새 대화가 만들어질 때 푸시 알림 보내기",
         "CONVERSATION_MENTION": "대화에서 멘션될 때 푸시 알림 보내기",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "할당된 대화에서 새 메시지가 생성될 때 푸시 알림 보내기",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "이 브라우저에 대한 푸시를 사용 가능으로 설정하셨습니다.",
         "REQUEST_PUSH": "푸시 알림 사용"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "대화",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "멘션",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "보고서",
     "SETTINGS": "설정",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "설정",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/signup.json b/app/javascript/dashboard/i18n/locale/ko/signup.json
index fc7f64bd9..e38ef41f6 100644
--- a/app/javascript/dashboard/i18n/locale/ko/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ko/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/lt/conversation.json b/app/javascript/dashboard/i18n/locale/lt/conversation.json
index b483d239f..f98a3cdc0 100644
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Delete",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index f1d87ee73..367b35b1c 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
index fa1ba638a..621a16ae8 100644
--- a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Uploading...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/login.json b/app/javascript/dashboard/i18n/locale/lt/login.json
index 30f667052..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/lt/login.json
+++ b/app/javascript/dashboard/i18n/locale/lt/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index 4c9ef685f..6e6a8b675 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/signup.json b/app/javascript/dashboard/i18n/locale/lt/signup.json
index 8defb3133..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/lt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lt/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index defa3191c..db5b5bb87 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopēt",
       "DELETE": "Dzēst",
-      "CREATE_A_CANNED_RESPONSE": "Pievienot sagatavotajām atbildēm"
+      "CREATE_A_CANNED_RESPONSE": "Pievienot sagatavotajām atbildēm",
+      "TRANSLATE": "Tulkot"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Tēma"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Piedalās",
+    "SIDEBAR_TITLE": "Sarunas dalībnieki",
+    "NO_RECORDS_FOUND": "Nav atrasts",
+    "ADD_PARTICIPANTS": "Izvēlieties dalībniekus",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} citi",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} cits",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} cilvēki piedalās.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} persona piedalās.",
+    "NO_PARTICIPANTS_TEXT": "Neviens nepiedalās!",
+    "WATCH_CONVERSATION": "Pievienoties sarunai",
+    "YOU_ARE_WATCHING": "Jūs piedalāties",
+    "API": {
+      "ERROR_MESSAGE": "Nevarēja atjaunināt, mēģiniet vēlreiz!",
+      "SUCCESS_MESSAGE": "Dalībnieki atjaunināti!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "Skatīt tulkoto saturu",
+    "DESC": "Jūs varat skatīt tulkoto saturu katrā valodā.",
+    "ORIGINAL_CONTENT": "Oriģinālais Saturs",
+    "TRANSLATED_CONTENT": "Tulkotais Saturs",
+    "NO_TRANSLATIONS_AVAILABLE": "Šim saturam nav pieejami tulkojumi"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index f78a8e86a..a51724d61 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Jauna saruna",
       "conversation_assignment": "Saruna Piešķirta",
       "assigned_conversation_new_message": "Jauns ziņojums",
+      "participating_conversation_new_message": "Jauns ziņojums",
       "conversation_mention": "Pieminēt"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
index 77a15c834..458cf1023 100644
--- a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Notiek saglabāšana...",
       "SAVED": "Saglabāts"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Augšupielādēt attēlu",
+        "UPLOADING": "Notiek Augšupielāde...",
+        "SUCCESS": "Attēls ir veiksmīgi augšupielādēts",
+        "ERROR": "Augšupielādējot attēlu, radās kļūda",
+        "ERROR_FILE_SIZE": "Attēla izmēram ir jābūt mazākam par {size}MB",
+        "ERROR_FILE_FORMAT": "Attēla formātam ir jābūt jpg, jpeg vai png",
+        "ERROR_FILE_DIMENSIONS": "Attēla izmēram ir jābūt mazākam par 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Raksta iestatījumi",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/login.json b/app/javascript/dashboard/i18n/locale/lv/login.json
index d090bbdac..7cc74c8a0 100644
--- a/app/javascript/dashboard/i18n/locale/lv/login.json
+++ b/app/javascript/dashboard/i18n/locale/lv/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Nevar izveidot savienojumu ar Woot serveri. Lūdzu, vēlāk pamēģiniet vēlreiz",
       "UNAUTH": "Nepareizs lietotājvārds/parole. Lūdzu mēģiniet vēlreiz"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Pieslēgties, izmantojot Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Lai pieslēgtos, lūdzu, izmantojiet sava uzņēmuma e-pasta adresi",
+      "NO_ACCOUNT_FOUND": "Mēs nevarējām atrast Jūsu e-pasta adreses kontu."
+    },
     "FORGOT_PASSWORD": "Aizmirsāt savu paroli?",
     "CREATE_NEW_ACCOUNT": "Izveidot jaunu kontu",
     "SUBMIT": "Pierakstīties"
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 2a9020b8d..f66a9a15e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Nosūtīt e -pasta paziņojumus, kad man tiek piešķirta saruna",
         "CONVERSATION_CREATION": "Nosūtīt e -pasta paziņojumus, kad tiek izveidota jauna saruna",
         "CONVERSATION_MENTION": "Nosūtīt e -pasta paziņojumus, kad tiekat pieminēts sarunā",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nosūtīt e -pasta paziņojumus, kad piešķirtā sarunā tiek izveidots jauns ziņojums"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nosūtīt e -pasta paziņojumus, kad piešķirtā sarunā tiek izveidots jauns ziņojums",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Sūtīt e-pasta paziņojumus, kad sarunā tiek izveidots jauns ziņojums"
       },
       "API": {
         "UPDATE_SUCCESS": "Jūsu paziņojumu preferences ir veiksmīgi atjauninātas",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Nosūtīt push paziņojumus, kad tiek izveidota jauna saruna",
         "CONVERSATION_MENTION": "Nosūtīt push paziņojumus, kad tiekat pieminēts sarunā",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nosūtīt push paziņojumus, kad piešķirtā sarunā tiek izveidots jauns ziņojums",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Sūtīt push paziņojumus, kad sarunā tiek izveidots jauns ziņojums",
         "HAS_ENABLED_PUSH": "Jūs esat iespējojis push šajā pārlūkprogrammā.",
         "REQUEST_PUSH": "Iespējot push paziņojumus"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Sarunas",
     "ALL_CONVERSATIONS": "Visas Sarunas",
     "MENTIONED_CONVERSATIONS": "Pieminēšanas",
+    "PARTICIPATING_CONVERSATIONS": "Piedalās",
     "UNATTENDED_CONVERSATIONS": "Bez uzraudzības",
     "REPORTS": "Pārskati",
     "SETTINGS": "Iestatījumi",
@@ -239,6 +242,7 @@
       "DRAFT": "Melnraksts",
       "ARCHIVED": "Arhivēts",
       "CATEGORY": "Kategorija",
+      "SETTINGS": "Iestatījumi",
       "CATEGORY_EMPTY_MESSAGE": "Kategorijas nav atrastas"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/signup.json b/app/javascript/dashboard/i18n/locale/lv/signup.json
index 57d5b101e..cbd8a9709 100644
--- a/app/javascript/dashboard/i18n/locale/lv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lv/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Viss, kas nepieciešams, ir viens solis, lai virzītos uz priekšu",
     "TESTIMONIAL_CONTENT": "Jūs esat viena soļa attālumā no klientu piesaistīšanas, noturēšanas un jaunu klientu atrašanas.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Reģistrēties, izmantojot Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Uzņēmuma nosaukums",
       "PLACEHOLDER": "Ievadiet sava uzņēmuma nosaukumu. Piemēram: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index 2584bdec2..17d0c2ac9 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "പകർത്തുക",
       "DELETE": "ഇല്ലാതാക്കുക",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "ഒരു ഫലവും കണ്ടെത്താനായില്ല",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 993305b44..d34d43ecb 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
index eb3ab5b16..6610313e1 100644
--- a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "ചിത്രം അപ്‌ലോഡു ചെയ്യുക",
+        "UPLOADING": "അപ്‌ലോഡുചെയ്യുന്നു...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/login.json b/app/javascript/dashboard/i18n/locale/ml/login.json
index 0b7b51341..820979587 100644
--- a/app/javascript/dashboard/i18n/locale/ml/login.json
+++ b/app/javascript/dashboard/i18n/locale/ml/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റു ചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക",
       "UNAUTH": "ഉപയോക്തൃനാമം / പാസ്‌വേഡ് തെറ്റാണ്. ദയവായി വീണ്ടും ശ്രമിക്കുക"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "നിങ്ങളുടെ പാസ്‌വേഡ് മറന്നോ?",
     "CREATE_NEW_ACCOUNT": "പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക",
     "SUBMIT": "സൈൻ ഇൻ"
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 04a6327e8..2da1c595a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "ഒരു സംഭാഷണം എനിക്ക് നിയോഗിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്‌ക്കുക",
         "CONVERSATION_CREATION": "ഒരു പുതിയ സംഭാഷണം സൃഷ്ടിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്ക്കുക",
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "പരാമർശിക്കുന്നു",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "റിപ്പോർട്ടുകൾ",
     "SETTINGS": "ക്രമീകരണങ്ങൾ",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "ക്രമീകരണങ്ങൾ",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/signup.json b/app/javascript/dashboard/i18n/locale/ml/signup.json
index ab2af2eed..e4d2ef6b7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ml/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ms/conversation.json b/app/javascript/dashboard/i18n/locale/ms/conversation.json
index 006193a5c..61372a2ba 100644
--- a/app/javascript/dashboard/i18n/locale/ms/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ms/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Padamkan",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Tiada dijumpa",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 2b0863574..8b2f2017d 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
index 414d4bfcd..d73b46ac9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Uploading...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/login.json b/app/javascript/dashboard/i18n/locale/ms/login.json
index df1394a73..ca8d181b9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/login.json
+++ b/app/javascript/dashboard/i18n/locale/ms/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Masalah untuk hubungi Woot Server, Sila cuba sebentar lagi",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index ebc4ae52f..4668b204b 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/signup.json b/app/javascript/dashboard/i18n/locale/ms/signup.json
index 2e96e40f0..dafa02ebc 100644
--- a/app/javascript/dashboard/i18n/locale/ms/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ms/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 3ea8fb31c..c935ded8d 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Delete",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index f1d87ee73..367b35b1c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
index fa1ba638a..5f19a355f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "अपलोड गर्दै...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/login.json b/app/javascript/dashboard/i18n/locale/ne/login.json
index 30f667052..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/ne/login.json
+++ b/app/javascript/dashboard/i18n/locale/ne/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 1c49f79f6..ec8b39160 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/signup.json b/app/javascript/dashboard/i18n/locale/ne/signup.json
index 8defb3133..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/ne/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ne/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index 03d367959..cc2ceebb5 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopiëren",
       "DELETE": "Verwijderen",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Geen resultaten gevonden",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 33f80b93c..8234ceee9 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
index 5fa24ea85..02bf131ce 100644
--- a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Afbeelding uploaden",
+        "UPLOADING": "Uploaden...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/login.json b/app/javascript/dashboard/i18n/locale/nl/login.json
index f9e417bea..2df202817 100644
--- a/app/javascript/dashboard/i18n/locale/nl/login.json
+++ b/app/javascript/dashboard/i18n/locale/nl/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw",
       "UNAUTH": "Gebruikersnaam/wachtwoord onjuist. Probeer het opnieuw\n"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Wachtwoord vergeten?",
     "CREATE_NEW_ACCOUNT": "Nieuw account aanmaken",
     "SUBMIT": "Inloggen"
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index da38eede2..12c719d90 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "E-mailberichten verzenden wanneer een gesprek aan mij is toegewezen",
         "CONVERSATION_CREATION": "E-mailberichten verzenden wanneer een nieuw gesprek is gemaakt",
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Uw notificatie-instellingen zijn succesvol bijgewerkt",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Stuur pushberichten wanneer een nieuw gesprek is aangemaakt",
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Je hebt pushberichten voor deze browser ingeschakeld.",
         "REQUEST_PUSH": "Pushberichten inschakelen"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Gesprekken",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Vermeldingen",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Rapporten",
     "SETTINGS": "Instellingen",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Categorie",
+      "SETTINGS": "Instellingen",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/signup.json b/app/javascript/dashboard/i18n/locale/nl/signup.json
index 6c96cb063..7258af4b3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/nl/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 6162f331e..16d657506 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopier",
       "DELETE": "Slett",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index 66df5d18e..698ae10d2 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Ny samtale",
       "conversation_assignment": "Samtale tildelt",
       "assigned_conversation_new_message": "Ny melding",
+      "participating_conversation_new_message": "Ny melding",
       "conversation_mention": "Omtale"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/no/helpCenter.json b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
index c7ca7e883..21608f072 100644
--- a/app/javascript/dashboard/i18n/locale/no/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Last opp bilde",
+        "UPLOADING": "Laster opp...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/no/login.json b/app/javascript/dashboard/i18n/locale/no/login.json
index d67b667d4..d01fea8d0 100644
--- a/app/javascript/dashboard/i18n/locale/no/login.json
+++ b/app/javascript/dashboard/i18n/locale/no/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere",
       "UNAUTH": "Brukernavn eller passord er feil. Prøv igjen"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Glemt passord?",
     "CREATE_NEW_ACCOUNT": "Opprett ny konto",
     "SUBMIT": "Logg inn"
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index c3c535fed..3e017b17e 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Send e-postvarsler når en samtale er tildelt meg",
         "CONVERSATION_CREATION": "Send e-postvarsler når en ny samtale opprettes",
         "CONVERSATION_MENTION": "Send varsel på e-post når du er nevnt i en samtale",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send e-postvarsler når en ny melding opprettes i en tilordnet samtale"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send e-postvarsler når en ny melding opprettes i en tilordnet samtale",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Dine varslingsinnstillinger er oppdatert",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Send push-varsler når en ny samtale opprettes",
         "CONVERSATION_MENTION": "Send pushvarslinger når du er nevnt i en samtale",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push-varsler når en ny melding opprettes i en tilordnet samtale",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Du har aktivert push-varsler for denne nettleseren.",
         "REQUEST_PUSH": "Aktiver push-varsler"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Samtaler",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Rapporter",
     "SETTINGS": "Innstillinger",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Innstillinger",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/no/signup.json b/app/javascript/dashboard/i18n/locale/no/signup.json
index 1fa81c8e7..0028ddd43 100644
--- a/app/javascript/dashboard/i18n/locale/no/signup.json
+++ b/app/javascript/dashboard/i18n/locale/no/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 3225b3060..133fb00a0 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Usuń",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Brak wyników",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index 6458b45b0..beb68218e 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nowa rozmowa",
       "conversation_assignment": "Rozmowa przypisana",
       "assigned_conversation_new_message": "Nowa wiadomość",
+      "participating_conversation_new_message": "Nowa wiadomość",
       "conversation_mention": "Wzmianka"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
index 8855a95ac..de369f6f7 100644
--- a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Prześlij obraz",
+        "UPLOADING": "Przesyłanie...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/login.json b/app/javascript/dashboard/i18n/locale/pl/login.json
index fcd941bd9..87dfb39e3 100644
--- a/app/javascript/dashboard/i18n/locale/pl/login.json
+++ b/app/javascript/dashboard/i18n/locale/pl/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później",
       "UNAUTH": "Nieprawidłowa nazwa użytkownika / hasło. Spróbuj ponownie"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Zapomniałeś hasła?",
     "CREATE_NEW_ACCOUNT": "Utwórz nowe konto",
     "SUBMIT": "Zaloguj się"
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 4f2a82338..298acad69 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Wysyłaj powiadomienia e-mail, gdy konwersacja jest przypisana do mnie",
         "CONVERSATION_CREATION": "Wysyłaj powiadomienia e-mail po utworzeniu nowej rozmowy",
         "CONVERSATION_MENTION": "Wysyłaj powiadomienia e-mail, gdy zostaniesz wymieniony w rozmowie",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia e-mail, gdy nowa wiadomość zostanie utworzona w przypisanej konwersacji"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Wysyłaj powiadomienia e-mail, gdy nowa wiadomość zostanie utworzona w przypisanej konwersacji",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Twoje preferencje powiadomień zostały pomyślnie zaktualizowane",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Włączyłeś opcję push dla tej przeglądarki.",
         "REQUEST_PUSH": "Włącz powiadomienia push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Rozmowy",
     "ALL_CONVERSATIONS": "Rozmowy",
     "MENTIONED_CONVERSATIONS": "Wzmianki",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Raporty",
     "SETTINGS": "Ustawienia",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Ustawienia",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/signup.json b/app/javascript/dashboard/i18n/locale/pl/signup.json
index e724c18b4..35fb911ae 100644
--- a/app/javascript/dashboard/i18n/locale/pl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pl/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
index ba756826a..8f9387524 100644
--- a/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
@@ -8,7 +8,7 @@
     "ASSIGN_LABEL": "Atribuir",
     "YES": "Sim",
     "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
-    "ASSIGN_TEAM_TOOLTIP": "Assign team",
+    "ASSIGN_TEAM_TOOLTIP": "Atribuir equipe",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
     "RESOLVE_SUCCESFUL": "Conversations resolved successfully",
diff --git a/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json
index c14c53f7e..3ed1af8e0 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>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>Respostas Prontas</b> </p><p> Respostas Prontas são modelos de respostas salvos que podem ser usados para enviar rapidamente uma resposta a uma conversa. </p><p> Para criar uma Resposta Pronta basta clicar em <b>Adicionar Resposta Pronta</b>. Você também pode editar ou apagar uma Resposta Pronta existente clicando no botão Editar ou Remover </p><p> Respostas prontas são usadas com a ajuda de <b>Shortcodes (Atalhos de códigos)</b>. Os agentes podem acessar as respostas prontas num chat digitando <b>'/'</b> seguido pelo shortcode. </p>",
     "LIST": {
       "404": "Não há respostas prontas disponíveis nesta conta.",
       "TITLE": "Gerenciar respostas prontas",
@@ -17,7 +17,7 @@
     },
     "ADD": {
       "TITLE": "Adicionar resposta pronta",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Respostas prontas são modelos de respostas salvos que podem ser usados para enviar rapidamente uma resposta para a conversa.",
       "CANCEL_BUTTON_TEXT": "cancelar",
       "FORM": {
         "SHORT_CODE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/chatlist.json b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
index 92f9e95e6..a2d8cc6e9 100644
--- a/app/javascript/dashboard/i18n/locale/pt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
@@ -60,12 +60,12 @@
     "REPLY_TO_TWEET": "Responder à mensagem",
     "LINK_TO_STORY": "Ir para story do instagram",
     "SENT": "Enviado com sucesso",
-    "READ": "Read successfully",
-    "DELIVERED": "Delivered successfully",
+    "READ": "Lido com sucesso",
+    "DELIVERED": "Entregue com Sucesso",
     "NO_MESSAGES": "Nenhuma mensagem",
     "NO_CONTENT": "Sem conteúdo disponível",
     "HIDE_QUOTED_TEXT": "Ocultar Texto Citado",
     "SHOW_QUOTED_TEXT": "Mostrar Texto Citado",
-    "MESSAGE_READ": "Read"
+    "MESSAGE_READ": "Lida"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 5bd56f081..c53a677ea 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -15,7 +15,7 @@
     "INITIATED_FROM": "Iniciado de",
     "INITIATED_AT": "Iniciado em",
     "IP_ADDRESS": "Endereço IP",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "Criado",
     "NEW_MESSAGE": "Nova mensagem",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "Não há conversas anteriores associadas a este contato.",
@@ -76,8 +76,8 @@
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "Confirmar Exclusão",
-      "MESSAGE": "Are you want sure to delete this note?",
-      "YES": "Yes, Delete it",
+      "MESSAGE": "Tem certeza que deseja excluir esta nota?",
+      "YES": "Sim, excluir",
       "NO": "Não, mantenha isso"
     }
   },
@@ -153,8 +153,8 @@
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "Avatar de contato removido com sucesso",
+        "ERROR_MESSAGE": "Não foi possível remover o avatar do contato. Por favor, tente novamente mais tarde."
       }
     },
     "SUCCESS_MESSAGE": "Contato guardado com sucesso",
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index f1adc6f17..863672894 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -2,9 +2,9 @@
   "CONVERSATION": {
     "SELECT_A_CONVERSATION": "Por favor, selecione uma conversa no painel da esquerda",
     "CSAT_REPLY_MESSAGE": "Por favor, avalie a conversa",
-    "404": "Sorry, we cannot find the conversation. Please try again",
-    "SWITCH_VIEW_LAYOUT": "Switch the layout",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
+    "404": "Desculpe, não encontramos a conversa. Por favor, tente novamente",
+    "SWITCH_VIEW_LAYOUT": "Alternar o layout",
+    "DASHBOARD_APP_TAB_MESSAGES": "Mensagens",
     "UNVERIFIED_SESSION": "A identidade deste usuário não foi verificada",
     "NO_MESSAGE_1": "Oh oh! Parece que não há mensagens de clientes na sua caixa de entrada.",
     "NO_MESSAGE_2": " para enviar uma mensagem para sua página!",
@@ -34,8 +34,8 @@
     "REPLYING_TO": "Está a responder a:",
     "REMOVE_SELECTION": "Remover seleção",
     "DOWNLOAD": "BAIXAR",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
-    "SAVE_CONTACT": "Save",
+    "UNKNOWN_FILE_TYPE": "Arquivo Desconhecido",
+    "SAVE_CONTACT": "Salvar",
     "UPLOADING_ATTACHMENTS": "Carregando anexos...",
     "SUCCESS_DELETE_MESSAGE": "Mensagem apagada com sucesso",
     "FAIL_DELETE_MESSSAGE": "Não foi possível apagar a mensagem! Tente novamente",
@@ -43,8 +43,8 @@
     "RATING_TITLE": "Avaliar",
     "FEEDBACK_TITLE": "Opiniões",
     "CARD": {
-      "SHOW_LABELS": "Show labels",
-      "HIDE_LABELS": "Hide labels"
+      "SHOW_LABELS": "Mostrar etiquetas",
+      "HIDE_LABELS": "Ocultar os etiquetas"
     },
     "HEADER": {
       "RESOLVE_ACTION": "Resolver",
@@ -68,31 +68,31 @@
     },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marcar como pendente",
-      "RESOLVED": "Mark as resolved",
-      "MARK_AS_UNREAD": "Mark as unread",
+      "RESOLVED": "Marcar como resolvida",
+      "MARK_AS_UNREAD": "Marcar como não lida",
       "REOPEN": "Reabrir conversa",
       "SNOOZE": {
-        "TITLE": "Snooze",
+        "TITLE": "Adiar",
         "NEXT_REPLY": "Até à próxima resposta",
         "TOMORROW": "Até amanhã",
         "NEXT_WEEK": "Até à próxima semana"
       },
-      "ASSIGN_AGENT": "Assign agent",
-      "ASSIGN_LABEL": "Assign label",
-      "AGENTS_LOADING": "Loading agents...",
-      "ASSIGN_TEAM": "Assign team",
+      "ASSIGN_AGENT": "Atribuir agente",
+      "ASSIGN_LABEL": "Atribuir etiqueta",
+      "AGENTS_LOADING": "Carregando agentes...",
+      "ASSIGN_TEAM": "Atribuir equipe",
       "API": {
         "AGENT_ASSIGNMENT": {
-          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
-          "FAILED": "Couldn't assign agent. Please try again."
+          "SUCCESFUL": "Conversa com ID %{conversationId} atribuída a \"%{agentName}\"",
+          "FAILED": "Não foi possível atribuir agente. Por favor, tente novamente."
         },
         "LABEL_ASSIGNMENT": {
-          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
-          "FAILED": "Couldn't assign label. Please try again."
+          "SUCCESFUL": "Etiqueta #%{labelName} atribuída a conversa de ID %{conversationId}",
+          "FAILED": "Não foi possível atribuir etiqueta. Por favor, tente novamente."
         },
         "TEAM_ASSIGNMENT": {
-          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
-          "FAILED": "Couldn't assign team. Please try again."
+          "SUCCESFUL": "Equipe \"%{team}\" atribuída  a conversa de ID %{conversationId}",
+          "FAILED": "Não foi possível atribuir equipe. Por favor, tente novamente."
         }
       }
     },
@@ -102,7 +102,7 @@
       "DISABLE_SIGN_TOOLTIP": "Desativar assinatura",
       "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",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Assinatura da mensagem não está configurada. Por favor, configure-a nas configurações do perfil.",
       "CLICK_HERE": "Clique aqui para atualizar"
     },
     "REPLYBOX": {
@@ -135,8 +135,8 @@
         }
       },
       "UNDEFINED_VARIABLES": {
-        "TITLE": "Undefined variables",
-        "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
+        "TITLE": "Variáveis indefinidas",
+        "MESSAGE": "Você tem {undefinedVariablesCount} variáveis indefinidas em sua mensagem: {undefinedVariables}. Você gostaria de enviar a mensagem mesmo assim?",
         "CONFIRM": {
           "YES": "Mandar",
           "CANCEL": "cancelar"
@@ -145,13 +145,13 @@
     },
     "VISIBLE_TO_AGENTS": "Nota Privada: Apenas visível para você e sua equipe",
     "CHANGE_STATUS": "Estado da conversa alterado",
-    "CHANGE_STATUS_FAILED": "Conversation status change failed",
+    "CHANGE_STATUS_FAILED": "Mudança de status da conversa falhou",
     "CHANGE_AGENT": "Responsável da conversa alterado",
-    "CHANGE_AGENT_FAILED": "Assignee change failed",
-    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
-    "ASSIGN_LABEL_FAILED": "Label assignment failed",
+    "CHANGE_AGENT_FAILED": "Falha na alteração da atribuição",
+    "ASSIGN_LABEL_SUCCESFUL": "Etiqueta atribuída com sucesso",
+    "ASSIGN_LABEL_FAILED": "Falha na atribuição de etiqueta",
     "CHANGE_TEAM": "Equipa de conversação alterada",
-    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB attachment limit",
+    "FILE_SIZE_LIMIT": "O arquivo excede o limite para anexos de {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB",
     "MESSAGE_ERROR": "Não foi possível enviar esta mensagem, por favor, tente novamente mais tarde",
     "SENT_BY": "Enviado por:",
     "BOT": "Bot",
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copiar",
       "DELETE": "excluir",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Adicionar às respostas prontas",
+      "TRANSLATE": "Traduzir"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -220,7 +221,7 @@
       "CONTACT_DETAILS": "Detalhes do Contacto",
       "CONVERSATION_ACTIONS": "Ações de Conversa",
       "CONVERSATION_LABELS": "Etiquetas da conversa",
-      "CONVERSATION_INFO": "Conversation Information",
+      "CONVERSATION_INFO": "Informação da conversa",
       "CONTACT_ATTRIBUTES": "Atributos do Contato",
       "PREVIOUS_CONVERSATION": "Conversas anteriores",
       "MACROS": "Macros"
@@ -253,5 +254,29 @@
     "BCC": "BCC",
     "CC": "Cc",
     "SUBJECT": "Assunto"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participando",
+    "SIDEBAR_TITLE": "Participantes da conversa",
+    "NO_RECORDS_FOUND": "Nenhum resultado encontrado",
+    "ADD_PARTICIPANTS": "Selecionar participantes",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} outros",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} outro",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} pessoas estão participando.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} pessoa está participando.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 05c73f780..a7fcc5a4f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nova conversa",
       "conversation_assignment": "Conversa atribuída",
       "assigned_conversation_new_message": "Nova mensagem",
+      "participating_conversation_new_message": "Nova mensagem",
       "conversation_mention": "Mencionar"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
index 9c3bc49a0..4a9d4bbeb 100644
--- a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload de imagem",
+        "UPLOADING": "A carregar...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/login.json b/app/javascript/dashboard/i18n/locale/pt/login.json
index efa7136d1..01019109d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/login.json
+++ b/app/javascript/dashboard/i18n/locale/pt/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde",
       "UNAUTH": "Nome de usuário / senha incorreta. Por favor, tente novamente"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Esqueceu-se da sua senha?",
     "CREATE_NEW_ACCOUNT": "Criar nova conta",
     "SUBMIT": "Iniciar sessão"
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 5d62dba5a..5e5f0f3e9 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Enviar notificações por email quando uma conversa é atribuída a mim",
         "CONVERSATION_CREATION": "Enviar notificações por email quando uma nova conversa é criada",
         "CONVERSATION_MENTION": "Enviar notificações por email quando for mencionado numa conversa",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar mensagem de email quando criada uma mensagem ou atribuída uma conversa"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar mensagem de email quando criada uma mensagem ou atribuída uma conversa",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "As suas preferências de notificação foram atualizadas com sucesso",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Enviar uma notificação Push quando uma conversa é criada",
         "CONVERSATION_MENTION": "Enviar uma notificação Push quando for mencionado numa conversa",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar uma notificação Push quando uma mensagem é criada numa conversa atribuída",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Ativou notificações Push neste navegador.",
         "REQUEST_PUSH": "Ativar notificações Push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversas",
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
+    "PARTICIPATING_CONVERSATIONS": "Participando",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "relatórios",
     "SETTINGS": "Confirgurações",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Confirgurações",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/signup.json b/app/javascript/dashboard/i18n/locale/pt/signup.json
index 0c7b4e55b..3492df3e3 100644
--- a/app/javascript/dashboard/i18n/locale/pt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 0e153819e..1bb59f609 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copiar",
       "DELETE": "Excluir",
-      "CREATE_A_CANNED_RESPONSE": "Adicionar às respostas prontas"
+      "CREATE_A_CANNED_RESPONSE": "Adicionar às respostas prontas",
+      "TRANSLATE": "Traduzir"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "CCO",
     "CC": "Cc",
     "SUBJECT": "Assunto"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participantes",
+    "SIDEBAR_TITLE": "Participantes da conversa",
+    "NO_RECORDS_FOUND": "Nenhum resultado encontrado",
+    "ADD_PARTICIPANTS": "Selecionar participantes",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} participantes",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} participante",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} pessoas estão participando.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} pessoa está participando.",
+    "NO_PARTICIPANTS_TEXT": "Ninguém está participando!",
+    "WATCH_CONVERSATION": "Participar da conversa",
+    "YOU_ARE_WATCHING": "Você está participando",
+    "API": {
+      "ERROR_MESSAGE": "Não foi possível atualizar, tente novamente!",
+      "SUCCESS_MESSAGE": "Participantes atualizados!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "Ver conteúdo traduzido",
+    "DESC": "Você pode visualizar o conteúdo traduzido em cada idioma.",
+    "ORIGINAL_CONTENT": "Conteúdo original",
+    "TRANSLATED_CONTENT": "Conteúdo Traduzido",
+    "NO_TRANSLATIONS_AVAILABLE": "Nenhuma tradução está disponível para este conteúdo"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index b15817665..f2e4eb5cf 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nova conversa",
       "conversation_assignment": "Conversa Atribuída",
       "assigned_conversation_new_message": "Nova Mensagem",
+      "participating_conversation_new_message": "Nova Mensagem",
       "conversation_mention": "Menção"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index ef87216f2..d2788af28 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Salvando...",
       "SAVED": "Salvo"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload de imagem",
+        "UPLOADING": "Enviando...",
+        "SUCCESS": "Imagem enviada com sucesso",
+        "ERROR": "Erro ao fazer upload da imagem",
+        "ERROR_FILE_SIZE": "O tamanho da imagem deve ser menor que {size}MB",
+        "ERROR_FILE_FORMAT": "O formato da imagem deve ser jpg, jpeg ou png",
+        "ERROR_FILE_DIMENSIONS": "Dimensões da imagem devem ser menores que 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Configurações de Artigo",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/login.json b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
index 5135189b8..f7df0e412 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/login.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde",
       "UNAUTH": "Nome de usuário / senha incorreta. Por favor, tente novamente"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login com o Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Por favor, use seu endereço de e-mail corporativo para entrar",
+      "NO_ACCOUNT_FOUND": "Não conseguimos encontrar uma conta para seu endereço de e-mail."
+    },
     "FORGOT_PASSWORD": "Esqueceu-se da sua senha?",
     "CREATE_NEW_ACCOUNT": "Criar nova conta",
     "SUBMIT": "Entrar"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 23c0fd69b..0e093ab26 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Enviar notificações por email quando uma conversa for atribuída a mim",
         "CONVERSATION_CREATION": "Enviar notificações por email quando uma nova conversa for criada",
         "CONVERSATION_MENTION": "Enviar notificações por email quando você for mencionado em uma conversa",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envie notificações por e-mail quando uma nova mensagem for criada numa conversa já atribuída"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envie notificações por e-mail quando uma nova mensagem for criada numa conversa já atribuída",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Enviar notificações por email quando uma nova mensagem é criada em uma conversa que você participa"
       },
       "API": {
         "UPDATE_SUCCESS": "Suas preferências de notificação foram atualizadas com sucesso",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Enviar notificações push quando uma nova conversa é criada",
         "CONVERSATION_MENTION": "Enviar notificações push quando você for mencionado em uma conversa",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envie notificações quando uma nova mensagem for criada numa conversa já atribuída",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Enviar notificações push quando uma nova mensagem é criada em uma conversa que você participa",
         "HAS_ENABLED_PUSH": "Você ativou push para este navegador.",
         "REQUEST_PUSH": "Habilitar notificações push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversas",
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
+    "PARTICIPATING_CONVERSATIONS": "Participantes",
     "UNATTENDED_CONVERSATIONS": "Não atendidas",
     "REPORTS": "Relatórios",
     "SETTINGS": "Configurações",
@@ -239,6 +242,7 @@
       "DRAFT": "Rascunho",
       "ARCHIVED": "Arquivado",
       "CATEGORY": "Categoria",
+      "SETTINGS": "Confirgurações",
       "CATEGORY_EMPTY_MESSAGE": "Nenhuma categoria encontrada"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
index 1c2f64de0..7b080659f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Tudo o que ele leva é um passo para avançar",
     "TESTIMONIAL_CONTENT": "Você está a um passo de engajar seus clientes, mantê-los e encontrar novos.",
     "TERMS_ACCEPT": "Ao criar uma conta, você concorda com nosso <a href=\"https://www.chatwoot.com/terms\">T & C</a> e nossa <a href=\"https://www.chatwoot.com/privacy-policy\">Política de privacidade</a>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Cadastre-se com o Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Nome Empresa",
       "PLACEHOLDER": "Digite seu nome da empresa. por exemplo: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json
index 6b4fa57ab..985fe324d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json
@@ -18,7 +18,7 @@
             "VARIABLES_LABEL": "Variáveis",
             "VARIABLE_PLACEHOLDER": "Insira o valor para %{variable}",
             "GO_BACK_LABEL": "Voltar",
-            "SEND_MESSAGE_LABEL": "Enviar Mensagem",
+            "SEND_MESSAGE_LABEL": "Enviar mensagem",
             "FORM_ERROR_MESSAGE": "Por favor, preencha todas as variáveis antes de enviar"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index 16b01fc10..01eb54696 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copiază",
       "DELETE": "Şterge",
-      "CREATE_A_CANNED_RESPONSE": "Adaugați la răspunsuri predefinite"
+      "CREATE_A_CANNED_RESPONSE": "Adaugați la răspunsuri predefinite",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subiect"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Niciun rezultat găsit",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index 6d405179a..2f6f71726 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Conversație nouă",
       "conversation_assignment": "Conversație atribuită",
       "assigned_conversation_new_message": "Trimite mesaj nou",
+      "participating_conversation_new_message": "Trimite mesaj nou",
       "conversation_mention": "a menţiona"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
index fed8f58e9..b7474bb1d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Se salvează...",
       "SAVED": "Salvat"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Încarcă imaginea",
+        "UPLOADING": "Încărcare...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Setări articol",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/login.json b/app/javascript/dashboard/i18n/locale/ro/login.json
index 7f956921b..26759579a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/login.json
+++ b/app/javascript/dashboard/i18n/locale/ro/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu",
       "UNAUTH": "Nume utilizator / parolă incorectă. Vă rugăm să încercaţi din nou"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Ai uitat parola?",
     "CREATE_NEW_ACCOUNT": "Creează un cont nou",
     "SUBMIT": "Conectează-te"
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 5bf3c8bd8..1f737b091 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Trimite notificări prin e-mail atunci când o conversație îmi este atribuită",
         "CONVERSATION_CREATION": "Trimite notificări prin e-mail atunci când o conversație nouă este creată",
         "CONVERSATION_MENTION": "Trimiterea notificărilor prin e-mail atunci când sunteți menționat într-o conversație",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Trimiterea notificărilor prin e-mail atunci când se creează un mesaj nou într-o conversație atribuită"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Trimiterea notificărilor prin e-mail atunci când se creează un mesaj nou într-o conversație atribuită",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Preferințele de notificare sunt actualizate cu succes",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Trimite notificări push atunci când o conversație nouă este creată",
         "CONVERSATION_MENTION": "Trimiterea notificărilor push atunci când sunteți menționat într-o conversație",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Trimiterea notificărilor push atunci când se creează un mesaj nou într-o conversație atribuită",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Ați activat apăsarea pentru acest browser.",
         "REQUEST_PUSH": "Activează notificările push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversații",
     "ALL_CONVERSATIONS": "Toate conversațiile",
     "MENTIONED_CONVERSATIONS": "Menţionări",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Rapoarte",
     "SETTINGS": "Setări",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Setări",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/signup.json b/app/javascript/dashboard/i18n/locale/ro/signup.json
index c6b1a3898..5a6249265 100644
--- a/app/javascript/dashboard/i18n/locale/ro/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ro/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 637fc2a9b..dffe8a047 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Копировать",
       "DELETE": "Удалить",
-      "CREATE_A_CANNED_RESPONSE": "Добавить в шаблонные ответы"
+      "CREATE_A_CANNED_RESPONSE": "Добавить в шаблонные ответы",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Тема"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Результаты не найдены",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 5f62162fe..e9b521d54 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Новая беседа",
       "conversation_assignment": "Беседа назначена",
       "assigned_conversation_new_message": "Новое сообщение",
+      "participating_conversation_new_message": "Новое сообщение",
       "conversation_mention": "Упоминание"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
index 5a937a74a..5309509b2 100644
--- a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Сохранение...",
       "SAVED": "Сохранено"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Загрузить изображение",
+        "UPLOADING": "Загружаем...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Настройки статей",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/login.json b/app/javascript/dashboard/i18n/locale/ru/login.json
index ecb38596e..e4268bd86 100644
--- a/app/javascript/dashboard/i18n/locale/ru/login.json
+++ b/app/javascript/dashboard/i18n/locale/ru/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже",
       "UNAUTH": "Неверное имя пользователя / пароль. Пожалуйста, попробуйте еще раз"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Забыли пароль?",
     "CREATE_NEW_ACCOUNT": "Создать новый аккаунт",
     "SUBMIT": "Вход"
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index eaa930b68..ad0e742ba 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Отправлять email уведомление, когда мне назначен диалог",
         "CONVERSATION_CREATION": "Отправлять email уведомление, когда новый диалог создан",
         "CONVERSATION_MENTION": "Отправлять email уведомление, когда вас упоминают в диалоге",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Отправлять email уведомления при создании нового сообщения в назначенном диалоге"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Отправлять email уведомления при создании нового сообщения в назначенном диалоге",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Настройки уведомлений сохранены",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Отправлять push уведомление, когда новый диалог создан",
         "CONVERSATION_MENTION": "Отправлять уведомления при упоминании в разговоре",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Отправлять push уведомления при создании нового сообщения в назначенном диалоге",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Вы включили push уведомления для этого браузера.",
         "REQUEST_PUSH": "Включить push-уведомления"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Диалоги",
     "ALL_CONVERSATIONS": "Диалоги",
     "MENTIONED_CONVERSATIONS": "Упоминания",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Несвязанные",
     "REPORTS": "Отчёты",
     "SETTINGS": "Настройки",
@@ -239,6 +242,7 @@
       "DRAFT": "Черновик",
       "ARCHIVED": "Архив",
       "CATEGORY": "Категория",
+      "SETTINGS": "Настройки",
       "CATEGORY_EMPTY_MESSAGE": "Категорий не найдено"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/signup.json b/app/javascript/dashboard/i18n/locale/ru/signup.json
index 2a1bdf485..f14fc0624 100644
--- a/app/javascript/dashboard/i18n/locale/ru/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ru/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Все, что нужно сделать, это один шаг для продвижения вперед",
     "TESTIMONIAL_CONTENT": "Вы находитесь на расстоянии всего одного шага от привлечения своих клиентов, удержав их и находя новые.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Название компании",
       "PLACEHOLDER": "Введите имя вашей компании, например: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index f9cf84208..dfd40de26 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Vymazať",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Skrytá kópia",
     "CC": "Kópia",
     "SUBJECT": "Predmet"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Žiadne výsledky neboli nájdené",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index 120ceddca..a04f32839 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Nová konverzácia",
       "conversation_assignment": "Konverzácia pridelená",
       "assigned_conversation_new_message": "Nová správa",
+      "participating_conversation_new_message": "Nová správa",
       "conversation_mention": "Zmienka"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
index d328d3e86..cc0175f41 100644
--- a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Nahrávanie...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/login.json b/app/javascript/dashboard/i18n/locale/sk/login.json
index 69696c731..9a500cd7b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/login.json
+++ b/app/javascript/dashboard/i18n/locale/sk/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Prihlásenie"
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 3452c0740..0dc467b6b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Odosielať e-mailové upozornenia, keď mi je priradená konverzácia",
         "CONVERSATION_CREATION": "Odosielať e-mailové upozornenia pri vytvorení novej konverzácie",
         "CONVERSATION_MENTION": "Odosielať e-mailové upozornenia keď som spomenutý v konverzácii",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odosielať e-mailové oznámenia pri vytvorení novej správy v priradenej konverzácii"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odosielať e-mailové oznámenia pri vytvorení novej správy v priradenej konverzácii",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Vaše nastavenia oznámení sa úspešne aktualizovali",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Odosielať Push upozornenia pri vytvorení novej konverzácie",
         "CONVERSATION_MENTION": "Odosielať Push upozornenia keď som spomenutý v konverzácii",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Odosielať Push oznámenia pri vytvorení novej správy v priradenej konverzácii",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Pre tento prehliadač ste povolili oznámenia Push.",
         "REQUEST_PUSH": "Povoliť oznámenia Push"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Rozhovory",
     "ALL_CONVERSATIONS": "Všetky konverzácie",
     "MENTIONED_CONVERSATIONS": "Zmienky",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Nastavenia",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Nastavenia",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/signup.json b/app/javascript/dashboard/i18n/locale/sk/signup.json
index 3b1f42d34..63e7160f7 100644
--- a/app/javascript/dashboard/i18n/locale/sk/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sk/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/sr/conversation.json b/app/javascript/dashboard/i18n/locale/sr/conversation.json
index 17ef2112d..a4f61acf3 100644
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopiraj",
       "DELETE": "Izbriši",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Naslov"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Ništa nije pronađeno",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 38e6ef29e..079553d83 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Novi razgovor",
       "conversation_assignment": "Dodeljen razgovoru",
       "assigned_conversation_new_message": "Nova poruka",
+      "participating_conversation_new_message": "Nova poruka",
       "conversation_mention": "Pominjanje"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
index e38f6270c..eeed7b7fd 100644
--- a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Dodaj sliku",
+        "UPLOADING": "Dodavanje...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Podešavanja ćlanka",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/login.json b/app/javascript/dashboard/i18n/locale/sr/login.json
index 02d476daa..0e5bbb667 100644
--- a/app/javascript/dashboard/i18n/locale/sr/login.json
+++ b/app/javascript/dashboard/i18n/locale/sr/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije",
       "UNAUTH": "Korisničko ime / lozinka nije ispravna. Molim vas pokušajte ponovo"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Da li ste zaboravili lozinku?",
     "CREATE_NEW_ACCOUNT": "Napravite novi nalog",
     "SUBMIT": "Prijava"
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 26236a009..637e25815 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Pošalji obaveštenje putem e-poruke kada je razgovor dodeljen meni",
         "CONVERSATION_CREATION": "Pošalji obaveštenje putem e-poruke kada je napravljen novi razgovor",
         "CONVERSATION_MENTION": "Pošalji obaveštenje putem e-poruke kada ste pomenuti u razgovoru",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Pošalji obaveštenje putem e-poruke kada je napravljena nova poruka u dodeljenom razgovoru"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Pošalji obaveštenje putem e-poruke kada je napravljena nova poruka u dodeljenom razgovoru",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Vaša podešavanja obaveštenja su uspešno izmenjena",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Pošalji mobilno obaveštenje kada je napravljen novi razgovor",
         "CONVERSATION_MENTION": "Pošalji mobilno obaveštenje kada ste pomenuti u razgovoru",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Pošalji mobilno obaveštenje kada je napravljena nova poruka u dodeljenom razgovoru",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Omogućili ste obaveštenje za ovaj pregledač.",
         "REQUEST_PUSH": "Omogućite mobilna obaveštenja"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Razgovori",
     "ALL_CONVERSATIONS": "Svi razgovori",
     "MENTIONED_CONVERSATIONS": "Spominjanja",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Nedodeljeni",
     "REPORTS": "Izveštaji",
     "SETTINGS": "Podešavanja",
@@ -239,6 +242,7 @@
       "DRAFT": "Nacrt",
       "ARCHIVED": "Arhivirano",
       "CATEGORY": "Kategorija",
+      "SETTINGS": "Podešavanja",
       "CATEGORY_EMPTY_MESSAGE": "Nije pronađena nijedna kategorija"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/signup.json b/app/javascript/dashboard/i18n/locale/sr/signup.json
index 71d6af6a5..c6d4bfaaf 100644
--- a/app/javascript/dashboard/i18n/locale/sr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sr/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 5e3156dcd..e9bb96e8e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopiera",
       "DELETE": "Radera",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Inga resultat hittades",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 6b93c80ff..0cbc814c2 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Ny konversation",
       "conversation_assignment": "Konversationen tilldelad",
       "assigned_conversation_new_message": "Nytt meddelande",
+      "participating_conversation_new_message": "Nytt meddelande",
       "conversation_mention": "Omnämning"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
index 28af23da3..57aee8d6c 100644
--- a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Ladda upp bild",
+        "UPLOADING": "Laddar upp...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/login.json b/app/javascript/dashboard/i18n/locale/sv/login.json
index 0fd8b7ce1..459c6b659 100644
--- a/app/javascript/dashboard/i18n/locale/sv/login.json
+++ b/app/javascript/dashboard/i18n/locale/sv/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare",
       "UNAUTH": "Användarnamn / lösenord felaktigt. Försök igen"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Glömt ditt lösenord?",
     "CREATE_NEW_ACCOUNT": "Skapa nytt konto",
     "SUBMIT": "Logga in"
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 838c79614..747bc9b72 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Skicka e-postmeddelanden när en konversation är tilldelad till mig",
         "CONVERSATION_CREATION": "Skicka e-postmeddelanden när en ny konversation skapas",
         "CONVERSATION_MENTION": "Skicka e-postaviseringar när du nämns i en konversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Skicka e-postaviseringar när ett nytt meddelande skapas i en tilldelad konversation"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Skicka e-postaviseringar när ett nytt meddelande skapas i en tilldelad konversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Dina aviseringsinställningar har uppdaterats",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Skicka push-notiser när en ny konversation skapas",
         "CONVERSATION_MENTION": "Skicka push-meddelanden när du nämns i en konversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Skicka push-meddelanden när ett nytt meddelande skapas i en tilldelad konversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Du har aktiverat push-funktionen för denna webbläsare.",
         "REQUEST_PUSH": "Aktivera push-meddelanden"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Konversationer",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Rapporter",
     "SETTINGS": "Inställningar",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Inställningar",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/signup.json b/app/javascript/dashboard/i18n/locale/sv/signup.json
index b1d8ca772..6750a677e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sv/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index f33c9f9fc..682b9fffb 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "நகல்",
       "DELETE": "Delete",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index f68524d50..8416ebe12 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
index 2cb2b0df4..3e3bd861a 100644
--- a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "படத்தை பதிவேற்றம் செய்யவும்",
+        "UPLOADING": "பதிவேறுகிறது...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/login.json b/app/javascript/dashboard/i18n/locale/ta/login.json
index 532fd0d0c..7049de785 100644
--- a/app/javascript/dashboard/i18n/locale/ta/login.json
+++ b/app/javascript/dashboard/i18n/locale/ta/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்",
       "UNAUTH": "பயனர்பெயர் / பாஸ்வேர்டு தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "உங்கள் பாஸ்வேர்ட்டை மறந்துவிட்டதா?",
     "CREATE_NEW_ACCOUNT": "புதிய கணக்கை உருவாக்க",
     "SUBMIT": "உள்நுழையவும்"
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 3e6bd80f7..61be20dc7 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "ஒரு உரையாடல் எனக்கு ஒதுக்கப்பட்டால் ஈமெயிலில் அறிவிப்புகளை அனுப்பவும்",
         "CONVERSATION_CREATION": "புதிய உரையாடல் உருவாக்கப்படும்போது ஈ-மெயிலில் அறிவிப்புகளை அனுப்பவும்",
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "உங்களின் அறிவிப்பு விருப்பத்தேர்வுகள் வெற்றிகரமாக புதுப்பிக்கப்பட்டன",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "புதிய உரையாடல் உருவாக்கப்படும்போது புஷ் அறிவிப்புகளை அனுப்பவும்",
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "இந்த பிரௌசருக்கான புஷ் அறிவிப்புகளை இயக்கியுள்ளீர்கள்.",
         "REQUEST_PUSH": "புஷ் அறிவிப்புகளை இயக்கு"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "உரையாடல்கள்",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "அறிக்கைகள்",
     "SETTINGS": "அமைப்புகள்",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "அமைப்புகள்",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/signup.json b/app/javascript/dashboard/i18n/locale/ta/signup.json
index 12b841d91..5b3de3c38 100644
--- a/app/javascript/dashboard/i18n/locale/ta/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ta/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index d17b2dc5e..e3f3773a3 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "คัดลอก",
       "DELETE": "ลบ",
-      "CREATE_A_CANNED_RESPONSE": "เพิ่มไปยังชุดคำตอบสำเร็จรูป"
+      "CREATE_A_CANNED_RESPONSE": "เพิ่มไปยังชุดคำตอบสำเร็จรูป",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "สำเนาลับ",
     "CC": "สำเนา",
     "SUBJECT": "หัวเรื่อง"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index ea7e26359..422c87afc 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "สร้างการสนทนาใหม่",
       "conversation_assignment": "การสนทนาที่ถูกมอบหมาย",
       "assigned_conversation_new_message": "ข้อความใหม่",
+      "participating_conversation_new_message": "ข้อความใหม่",
       "conversation_mention": "กล่าวถึง"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/th/helpCenter.json b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
index caa42d82e..6d370432c 100644
--- a/app/javascript/dashboard/i18n/locale/th/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "กำลังบันทึก...",
       "SAVED": "บันทึกแล้ว"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "อัปโหลดรูปภาพ",
+        "UPLOADING": "กำลังอัพโหลด",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "ตั้งค่าบทความ",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/th/login.json b/app/javascript/dashboard/i18n/locale/th/login.json
index bafd1ccd1..224d5ee8a 100644
--- a/app/javascript/dashboard/i18n/locale/th/login.json
+++ b/app/javascript/dashboard/i18n/locale/th/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง",
       "UNAUTH": "ชื่อผู้ใช้งานหรือรหัสผ่านไม่ถูกต้อง โปรดลองใหม่อีกครั้ง"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "ลืมรหัสผ่าน?",
     "CREATE_NEW_ACCOUNT": "สร้างบัญชีใหม่",
     "SUBMIT": "เข้าสู่ระบบ"
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 9dc4e9307..84a1f6eb2 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "ส่งอีเมลแจ้งเตือนเมื่อมีบทสนทนาที่ฉันได้รับมอบหมาย",
         "CONVERSATION_CREATION": "ส่งอีเมลแจ้งเตือนเมื่อมีการสร้างบทสนทนาใหม่",
         "CONVERSATION_MENTION": "ส่งอีเมลแจ้งเตือนเมื่อฉันถูกกล่าวถึงในการสนทนา",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "ส่งอีเมลแจ้งเตือนเมื่อมีข้อความใหม่ในการสนทนาที่ฉันได้รับมอบหมาย"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "ส่งอีเมลแจ้งเตือนเมื่อมีข้อความใหม่ในการสนทนาที่ฉันได้รับมอบหมาย",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "ปรับแต่งการแจ้งเตือนสำเร็จแล้ว",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "ส่งการแจ้งเตือนแบบพุชเมื่อมีการสนทนาใหม่",
         "CONVERSATION_MENTION": "ส่งการแจ้งเตือนแบบพุชเมื่อฉันถูกกล่าวถึงในการสนทนา",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "ส่งการแจ้งเตือนแบบพุชเมื่อมีข้อความใหม่ในการสนทนาที่ฉันได้รับมอบหมาย",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "คุณได้เปิดการแจ้งเตือนแบบพุชสำหรับเบราว์เซอร์นี้",
         "REQUEST_PUSH": "เปิดการแจ้งเตือนแบบพุช"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "การสนทนา",
     "ALL_CONVERSATIONS": "การสนทนาทั้งหมด",
     "MENTIONED_CONVERSATIONS": "การกล่าวถึง",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "ไม่ได้เข้าร่วม",
     "REPORTS": "รายงาน",
     "SETTINGS": "ตั้งค่า",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "ตั้งค่า",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/th/signup.json b/app/javascript/dashboard/i18n/locale/th/signup.json
index 83005d497..030ffd81d 100644
--- a/app/javascript/dashboard/i18n/locale/th/signup.json
+++ b/app/javascript/dashboard/i18n/locale/th/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index d25e95955..a9b72dc5b 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Kopyala",
       "DELETE": "Sil",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Konu"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Sonuç bulunamadı",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 6883ed5de..51dcd7356 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Yeni görüşme",
       "conversation_assignment": "Atanan görüşme",
       "assigned_conversation_new_message": "Yeni Mesaj",
+      "participating_conversation_new_message": "Yeni Mesaj",
       "conversation_mention": "Bahset"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
index 9935a60be..49c714e09 100644
--- a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Resim yükleniyor",
+        "UPLOADING": "Yükleniyor ...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/login.json b/app/javascript/dashboard/i18n/locale/tr/login.json
index c9f3c7ca9..267933d03 100644
--- a/app/javascript/dashboard/i18n/locale/tr/login.json
+++ b/app/javascript/dashboard/i18n/locale/tr/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin",
       "UNAUTH": "Kullanıcı Adı / Parola Yanlış. Lütfen tekrar deneyin"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Parolanızı mı unuttunuz?",
     "CREATE_NEW_ACCOUNT": "Yeni hesap oluştur",
     "SUBMIT": "Oturum aç"
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index f6f05f284..0e4d8bc64 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Bana bir konuşma atandığında e-posta bildirimleri gönder",
         "CONVERSATION_CREATION": "Yeni bir görüşme oluşturulduğunda e-posta bildirimleri gönderin",
         "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Atanmış bir görüşmede yeni bir mesaj oluşturulduğunda e-posta bildirimleri gönderin"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Atanmış bir görüşmede yeni bir mesaj oluşturulduğunda e-posta bildirimleri gönderin",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Bildirim tercihleriniz başarıyla güncellendi",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Yeni bir görüşme oluşturulduğunda anlık bildirimler gönderin",
         "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Atanan bir görüşmede yeni bir mesaj oluşturulduğunda anlık bildirimler gönderin",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Bu tarayıcı için bildirim özelliğini etkinleştirdiniz.",
         "REQUEST_PUSH": "Bildirimlerini etkinleştirin"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Konuşmalar",
     "ALL_CONVERSATIONS": "Tüm Görüşmeler",
     "MENTIONED_CONVERSATIONS": "Bahsedilmeler",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Raporlar",
     "SETTINGS": "Ayarlar",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Ayarlar",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/signup.json b/app/javascript/dashboard/i18n/locale/tr/signup.json
index 15a5b55be..d1b20e53c 100644
--- a/app/javascript/dashboard/i18n/locale/tr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/tr/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index f5fe37dc7..6245bfbab 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Копіювати",
       "DELETE": "Видалити",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Прихована копія",
     "CC": "Копія",
     "SUBJECT": "Тема"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Результатів не знайдено",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index ec3f6cb9e..3b506a51f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Новий діалог",
       "conversation_assignment": "Діалог призначений",
       "assigned_conversation_new_message": "Нове повідомлення",
+      "participating_conversation_new_message": "Нове повідомлення",
       "conversation_mention": "Відмітка"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
index 167f7e213..7ec96a34f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Збереження...",
       "SAVED": "Збережено"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Завантажити зображення",
+        "UPLOADING": "Завантажується...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Налаштування статей",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/login.json b/app/javascript/dashboard/i18n/locale/uk/login.json
index 029923168..be309e538 100644
--- a/app/javascript/dashboard/i18n/locale/uk/login.json
+++ b/app/javascript/dashboard/i18n/locale/uk/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше",
       "UNAUTH": "Неправильне ім'я користувача / пароль. Будь ласка, спробуйте ще раз"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Забули пароль?",
     "CREATE_NEW_ACCOUNT": "Створити новий обліковий запис",
     "SUBMIT": "Увійти"
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 8a4b74f78..d16514c5c 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "Надсилати сповіщення коли бесіду призначають мені",
         "CONVERSATION_CREATION": "Надсилати сповіщення при створенні нової бесіди",
         "CONVERSATION_MENTION": "Надсилати сповіщення електронною поштою, коли вас згадують в розмові",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Надсилати сповіщення при створенні нового повідомлення у призначеній розмові"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Надсилати сповіщення при створенні нового повідомлення у призначеній розмові",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Налаштування сповіщень для вашого акаунту оновлено успішно",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Надсилати push-повідомлення, коли створюється нова розмова",
         "CONVERSATION_MENTION": "Надсилати push-повідомлення, коли вас згадують в розмові",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Надсилати push-повідомлення, коли нове повідомлення створюється в призначеній розмові",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "Ви увімкнули push для цього браузера.",
         "REQUEST_PUSH": "Увімкнути push-сповіщення"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Бесіди",
     "ALL_CONVERSATIONS": "Всі розмови",
     "MENTIONED_CONVERSATIONS": "Згадування",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Не зв'язаний",
     "REPORTS": "Звіти",
     "SETTINGS": "Налаштування",
@@ -239,6 +242,7 @@
       "DRAFT": "Чернетка",
       "ARCHIVED": "Архівовано",
       "CATEGORY": "Категорія",
+      "SETTINGS": "Налаштування",
       "CATEGORY_EMPTY_MESSAGE": "Категорій не знайдено"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/signup.json b/app/javascript/dashboard/i18n/locale/uk/signup.json
index 13c3e6722..f3482eb4a 100644
--- a/app/javascript/dashboard/i18n/locale/uk/signup.json
+++ b/app/javascript/dashboard/i18n/locale/uk/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index 8355b1c7c..dd77c4d5a 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "حذف کریں۔",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "کوئی نتیجہ نہیں",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index 791ff7aac..bc290cddf 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
index 921590e73..bb9857c80 100644
--- a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Uploading...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/login.json b/app/javascript/dashboard/i18n/locale/ur/login.json
index 2de7f339e..d65635b15 100644
--- a/app/javascript/dashboard/i18n/locale/ur/login.json
+++ b/app/javascript/dashboard/i18n/locale/ur/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index 785857c83..8ea0880d0 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "مکالمات",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "تذکرہ",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/signup.json b/app/javascript/dashboard/i18n/locale/ur/signup.json
index b1195d7e2..66224b2fb 100644
--- a/app/javascript/dashboard/i18n/locale/ur/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ur/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
index b483d239f..f98a3cdc0 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Delete",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index f1d87ee73..367b35b1c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
+      "participating_conversation_new_message": "New Message",
       "conversation_mention": "Mention"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
index fa1ba638a..621a16ae8 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Uploading...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/login.json b/app/javascript/dashboard/i18n/locale/ur_IN/login.json
index 30f667052..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/login.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
     "SUBMIT": "Login"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 4c9ef685f..6e6a8b675 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -79,7 +79,8 @@
         "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"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
@@ -92,6 +93,7 @@
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
         "REQUEST_PUSH": "Enable push notifications"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/signup.json b/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
index 8defb3133..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index 1927c0cd5..845c6b5ec 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "Sao Chép",
       "DELETE": "Xoá",
-      "CREATE_A_CANNED_RESPONSE": "Thêm vào câu trả lời soạn sẵn"
+      "CREATE_A_CANNED_RESPONSE": "Thêm vào câu trả lời soạn sẵn",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Chủ đề"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "Không tìm thấy kết quả",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index 05f266b98..f7c41e6d5 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "Hội thoại mới mới",
       "conversation_assignment": "Hội thoại đã được phân công",
       "assigned_conversation_new_message": "Tin nhắn mới",
+      "participating_conversation_new_message": "Tin nhắn mới",
       "conversation_mention": "Nhắc đến"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
index afcbf703d..fb8b6c20a 100644
--- a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Đang lưu...",
       "SAVED": "Đã lưu"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Tải lên hình ảnh",
+        "UPLOADING": "Đang tải lên...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Cài đặt bài viết",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/login.json b/app/javascript/dashboard/i18n/locale/vi/login.json
index d1d05dc31..19065cb27 100644
--- a/app/javascript/dashboard/i18n/locale/vi/login.json
+++ b/app/javascript/dashboard/i18n/locale/vi/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau",
       "UNAUTH": "Tài khoản/Mật khẩu không đúng. Vui lòng thử lại"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "Quên mật khẩu?",
     "CREATE_NEW_ACCOUNT": "Tạo mới tài khoản",
     "SUBMIT": "Đăng nhập"
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 30db1a3d9..9839e5a2f 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -79,7 +79,8 @@
         "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": "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"
+        "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "Tùy chọn thông báo của bạn đã được cập nhật thành công",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "Gửi thông báo khi cuộc trò chuyện mới được tạo",
         "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "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"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "Cuộc trò chuyện",
     "ALL_CONVERSATIONS": "Tất cả cuộc trò chuyện",
     "MENTIONED_CONVERSATIONS": "Nhắn đến",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Không giám sát",
     "REPORTS": "Báo cáo",
     "SETTINGS": "Cài Đặt",
@@ -239,6 +242,7 @@
       "DRAFT": "Nháp",
       "ARCHIVED": "Lưu trữ",
       "CATEGORY": "Loại",
+      "SETTINGS": "Cài đặt",
       "CATEGORY_EMPTY_MESSAGE": "Không tìm thấy danh mục nào"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/signup.json b/app/javascript/dashboard/i18n/locale/vi/signup.json
index b6fdab6b5..de38793bb 100644
--- a/app/javascript/dashboard/i18n/locale/vi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/vi/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "Tất cả chỉ cần một bước để tiến về phía trước",
     "TESTIMONIAL_CONTENT": "Bạn chỉ còn một bước nữa là có thể thu hút khách hàng của mình, giữ chân họ và tìm kiếm những khách hàng mới.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Tên công ty",
       "PLACEHOLDER": "Nhập tên công ty của bạn. ví dụ: Doanh nghiệp Wayne",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 564c92a55..53743d80f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "复制",
       "DELETE": "删除",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 1f6472d2a..f4555d7ee 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "新建对话",
       "conversation_assignment": "对话已分配",
       "assigned_conversation_new_message": "新消息",
+      "participating_conversation_new_message": "新消息",
       "conversation_mention": "提及"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
index 6d7099803..e2da0a9cf 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "保存中...",
       "SAVED": "保存成功"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "上传头像",
+        "UPLOADING": "上传中...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "文章设置",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/login.json b/app/javascript/dashboard/i18n/locale/zh_CN/login.json
index fb64d8045..29e45e169 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/login.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "无法连接服务器，请稍后再试",
       "UNAUTH": "用户名/密码不正确。请重试"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "忘记密码了？",
     "CREATE_NEW_ACCOUNT": "创建新账户",
     "SUBMIT": "登录"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index c614974c6..57b752f34 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "当对话分配给我时发送电子邮件通知",
         "CONVERSATION_CREATION": "当对话分配给我时发送电子邮件通知",
         "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "在已分配的会话中创建新消息时发送电子邮件通知"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "在已分配的会话中创建新消息时发送电子邮件通知",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "您的通知设置已成功更新",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "创建新对话时发送推送通知",
         "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "在已分配的会话中创建新消息时发送推送通知",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "您已启用此浏览器的推送。",
         "REQUEST_PUSH": "启用推送通知"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "会话",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "提及",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "报告",
     "SETTINGS": "设置",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "类别",
+      "SETTINGS": "设置",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
index caded78f9..29656868e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index f4211df0f..760b8e12b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -165,7 +165,8 @@
     "CONTEXT_MENU": {
       "COPY": "複製",
       "DELETE": "刪除",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -253,5 +254,29 @@
     "BCC": "密件副本",
     "CC": "副本",
     "SUBJECT": "主旨"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index d5526751e..956892219 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -82,6 +82,7 @@
       "conversation_creation": "新對話",
       "conversation_assignment": "對話已被指派",
       "assigned_conversation_new_message": "新訊息",
+      "participating_conversation_new_message": "新訊息",
       "conversation_mention": "被提及"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
index bd34e02a8..d30d6abe8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
@@ -28,6 +28,17 @@
       "SAVING": "Saving...",
       "SAVED": "Saved"
     },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "上傳頭像",
+        "UPLOADING": "上傳中",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
     "ARTICLE_SETTINGS": {
       "TITLE": "Article Settings",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/login.json b/app/javascript/dashboard/i18n/locale/zh_TW/login.json
index 8fa334c58..30038bb33 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/login.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/login.json
@@ -14,6 +14,11 @@
       "ERROR_MESSAGE": "無法連接伺服器，請稍後再試",
       "UNAUTH": "用户名/密碼不正確。請重試"
     },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
     "FORGOT_PASSWORD": "忘記密碼了？",
     "CREATE_NEW_ACCOUNT": "建立新帳戶",
     "SUBMIT": "登入"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 4411ff77d..5d950c513 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -79,7 +79,8 @@
         "CONVERSATION_ASSIGNMENT": "當對話分配給我時發送電子信箱通知",
         "CONVERSATION_CREATION": "當對話分配給我時發送電子信箱通知",
         "CONVERSATION_MENTION": "當你在對話中被提及時以 Email 通知",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "當被指派的對話中有新訊息時以 Email 通知"
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "當被指派的對話中有新訊息時以 Email 通知",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
       },
       "API": {
         "UPDATE_SUCCESS": "您的通知設定已成功更新",
@@ -92,6 +93,7 @@
         "CONVERSATION_CREATION": "建立新對話時發送推送通知",
         "CONVERSATION_MENTION": "當你在對話中被提及時以推播通知",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "當被指派的對話中有新訊息時以推播通知",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
         "HAS_ENABLED_PUSH": "您已啟用此瀏覽器的推送。",
         "REQUEST_PUSH": "啟用推送通知"
       },
@@ -192,6 +194,7 @@
     "CONVERSATIONS": "會話",
     "ALL_CONVERSATIONS": "所有對話",
     "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "報表",
     "SETTINGS": "設定",
@@ -239,6 +242,7 @@
       "DRAFT": "Draft",
       "ARCHIVED": "Archived",
       "CATEGORY": "Category",
+      "SETTINGS": "設定",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
     "SET_AUTO_OFFLINE": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
index f248889a4..b8178336a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
@@ -5,6 +5,9 @@
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
     "COMPANY_NAME": {
       "LABEL": "Company name",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 472135fe9..c043501bb 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -90,7 +90,7 @@
   "INTEGRATIONS": {
     "DYTE": {
       "CLICK_HERE_TO_JOIN": "برای عضویت اینجا را کلیک کنید",
-      "LEAVE_THE_ROOM": "Leave the call"
+      "LEAVE_THE_ROOM": "تماس را ترک کنید"
     }
   }
 }
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 389ca75bd..9cba7f345 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -131,6 +131,10 @@ ar:
         header:
           from_with_name: '%{assignee_name} من %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} من %{inbox_name} <%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "رسائل جديدة في هذه المحادثة"
       transcript_subject: "نص المحادثة"
     survey:
@@ -155,6 +159,9 @@ ar:
     fullcontact:
       name: "الاتصال الكامل"
       description: "التكامل الكامل يساعد على إثراء ملفات تعريف الزوار. تحديد المستخدمين بمجرد مشاركتهم عنوان البريد الإلكتروني الخاص بهم وتقديم خدمة العملاء الخاصة بهم. قم بتوصيل اتصالك الكامل بحسابك عن طريق مشاركة مفتاح API للاتصال الكامل."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ar:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: الرئيسية
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: المقالات
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index dac883881..3ab0fa623 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -131,6 +131,10 @@ bg:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ bg:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ bg:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 09ef691d3..f6be8f0a3 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -131,6 +131,10 @@ ca:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Missatges nous en aquesta conversa"
       transcript_subject: "Transcripció de conversa"
     survey:
@@ -155,6 +159,9 @@ ca:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ca:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Inici
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index d6cd4f1ae..58a895b28 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -131,6 +131,10 @@ cs:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nové zprávy v této konverzaci"
       transcript_subject: "Přepis konverzace"
     survey:
@@ -155,6 +159,9 @@ cs:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ cs:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Domů
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: články
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/da.yml b/config/locales/da.yml
index f9f480ce7..9cb89fb9d 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -131,6 +131,10 @@ da:
         header:
           from_with_name: '%{assignee_name} fra %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} fra %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nye beskeder i denne samtale"
       transcript_subject: "Samtaleudskrift"
     survey:
@@ -155,6 +159,9 @@ da:
     fullcontact:
       name: "Fuldkontakt"
       description: "FullContact integration hjælper med at berige besøgende profiler. Identificere brugerne, så snart de deler deres e-mail-adresse og tilbyde dem skræddersyet kundeservice. Tilslut din FullContact til din konto ved at dele FullContact API-nøglen."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ da:
       results_title: Søgeresultater
     hero:
       sub_title: Søg efter artiklerne her eller gennemse kategorierne nedenfor.
+    common:
+      home: Hjem
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: artikler
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/de.yml b/config/locales/de.yml
index aad31cfa3..7894e26f9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -131,6 +131,10 @@ de:
         header:
           from_with_name: '%{assignee_name} von %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} von %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Neue Nachrichten in dieser Unterhaltung"
       transcript_subject: "Gesprächsprotokoll"
     survey:
@@ -155,6 +159,9 @@ de:
     fullcontact:
       name: "Vollständiger Kontakt"
       description: "Die vollständige Kontakt-Integration hilft die Besucherprofile zu erweitern. Identifizieren Sie die Benutzer, sobald diese ihre E-Mail-Adresse speichern um Ihnen maßgeschneiderten Kundenservice anbieten. Verbinden Sie einen Kontakt mit Ihrem Konto, indem Sie den Kontakt-API-Schlüssel freigeben."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Artikel nach Titel oder Text suchen...
@@ -163,3 +170,14 @@ de:
       results_title: Suchergebnisse
     hero:
       sub_title: Suchen Sie hier nach den Artikeln oder stöbern Sie in den unten stehenden Kategorien.
+    common:
+      home: Hauptseite
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: Artikel
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/el.yml b/config/locales/el.yml
index bc2e87a31..9c9bd84ca 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -131,6 +131,10 @@ el:
         header:
           from_with_name: '%{assignee_name} από %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} από %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "νέα μηνύματα σε αυτήν την συνομιλία"
       transcript_subject: "Μεταγραφή Συνομιλίας"
     survey:
@@ -155,6 +159,9 @@ el:
     fullcontact:
       name: "Πλήρης Επαφή"
       description: "Το FullContact Indegration βοηθά στον εμπλουτισμό προφίλ επισκεπτών. Προσδιορίστε τους χρήστες μόλις μοιραστούν τη διεύθυνση ηλεκτρονικού ταχυδρομείου τους και να τους προσφέρουν προσαρμοσμένη εξυπηρέτηση πελατών. Συνδέστε το FullContact με το λογαριασμό σας, κοινοποιώντας το κλειδί API FullContact."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Αναζήτηση άρθρου με τίτλο ή περιεχόμενο...
@@ -163,3 +170,14 @@ el:
       results_title: Αποτελέσματα Αναζήτησης
     hero:
       sub_title: Αναζητήστε τα άρθρα εδώ ή περιηγηθείτε στις κατηγορίες παρακάτω.
+    common:
+      home: Αρχική
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: άρθρα
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 23cd3dbbc..d77d9f46c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -131,6 +131,10 @@ es:
         header:
           from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nuevos mensajes en esta conversación"
       transcript_subject: "Transcripción de la conversación"
     survey:
@@ -155,6 +159,9 @@ es:
     fullcontact:
       name: "Nombre completo"
       description: "La integración con FullContact enriquece los perfiles de los visitantes. Identifique a los usuarios tan pronto compartan la dirección de correo electrónico y ofrezca un servicio al cliente personalizado. Conecte su cuenta de FullContact usando al clave de la API."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Buscar artículo por título o cuerpo...
@@ -163,3 +170,14 @@ es:
       results_title: Buscar resultados
     hero:
       sub_title: Busque aquí los artículos o busque las categorías de abajo.
+    common:
+      home: Inicio
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: artículos
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index efb93a58c..5a85e7e94 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -45,7 +45,7 @@ fa:
       locale:
         unique: باید منحصر به فرد در دسته‌بندی و پورتال باشد
     dyte:
-      invalid_message_type: "Invalid message type. Action not permitted"
+      invalid_message_type: "نوع پیام نامعتبر است. اقدام مجاز نیست"
     inboxes:
       imap:
         socket_error: لطفا اتصال شبکه، آدرس IMAP را بررسی کنید و دوباره امتحان کنید.
@@ -131,6 +131,10 @@ fa:
         header:
           from_with_name: '%{assignee_name} از %{inbox_name} «%{from_email}»'
           reply_with_name: '%{assignee_name} از %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} از <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "پیام‌های جدید در این مکالمه"
       transcript_subject: "متن مکالمه"
     survey:
@@ -141,8 +145,8 @@ fa:
   integration_apps:
     dyte:
       name: "Dyte"
-      description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
-      meeting_name: "%{agent_name} has started a meeting"
+      description: "Dyte ابزاری است که به شما کمک می کند تا صدا و تصویر زنده را تنها با چند خط کد به برنامه خود اضافه کنید. این ادغام به شما امکان می دهد تا گزینه ای را به نمایندگان خود بدهید تا بدون ترک چت با مشتریان خود تماس ویدیویی یا صوتی داشته باشند."
+      meeting_name: "%{agent_name} جلسه ای را آغاز کرده است"
     slack:
       name: "Slack"
       description: "Slack ابزاری برای گفتگو است که تمام ارتباطات شما را در یک مکان جمع می کند. با ادغام Slack ، می توانید از تمام مکالمات جدید در حساب خود در داخل Slack مطلع شوید."
@@ -155,6 +159,9 @@ fa:
     fullcontact:
       name: "تماس کامل"
       description: "ادغام FullContact به غنی سازی پروفایل بازدیدکنندگان کمک می کند. به محض به اشتراک گذاشتن آدرس ایمیل کاربران ، آنها را شناسایی کرده و به آنها خدمات مشتری مناسب ارائه دهید. با به اشتراک گذاشتن کلید APC FullContact ، حساب FullContact خود را به حساب خود وصل کنید."
+    google_translate:
+      name: "مترجم گوگل"
+      description: "با افزودن Google Translate یکپارچه سازی، ترجمه پیام ها را برای نمایندگان آسان تر کنید. Google translate به شناسایی خودکار زبان و تبدیل آن به زبان انتخاب شده توسط نماینده/مدیر حساب کمک می کند."
   public_portal:
     search:
       search_placeholder: جستجوی مقاله براساس عنوان یا متن...
@@ -163,3 +170,14 @@ fa:
       results_title: نتایج جستجو
     hero:
       sub_title: مقالات را در اینجا جستجو کنید یا دسته‌بندی‌های زیر را مرور کنید.
+    common:
+      home: صفحه اصلی
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: مقالات
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ff2c4c386..545ad498a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,6 +131,10 @@ fi:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Uusia viestejä"
       transcript_subject: "Keskustelukopio"
     survey:
@@ -155,6 +159,9 @@ fi:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ fi:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Koti
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6acc12c06..98f01955f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -131,6 +131,10 @@ fr:
         header:
           from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nouveaux messages dans cette conversation"
       transcript_subject: "Transcription de conversation"
     survey:
@@ -155,6 +159,9 @@ fr:
     fullcontact:
       name: "Fullcontact"
       description: "L'intégration FullContact permet d'enrichir les profils de visiteurs. Identifiez les utilisateurs dès qu'ils partagent leur adresse de courriel et offrez-leur un service client sur mesure. Connectez FullContact à votre compte en partageant la clé API FullContact."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Rechercher un article par titre ou contenu...
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 50df3fe72..e034ccd42 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -131,6 +131,10 @@ he:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ he:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ he:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: בית
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 9f108798a..138959b3f 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -131,6 +131,10 @@ hi:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ hi:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ hi:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 9d15b5425..14b17248b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -131,6 +131,10 @@ hu:
         header:
           from_with_name: '%{assignee_name} innen %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} innen %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Új üzenet a beszélgetésben"
       transcript_subject: "Beszélgetés kivonat"
     survey:
@@ -155,6 +159,9 @@ hu:
     fullcontact:
       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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ hu:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Nyitólap
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 1a61535f2..6e9a1be81 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -131,6 +131,10 @@ id:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Pesan baru pada percakapan ini"
       transcript_subject: "Transkrip Percakapan"
     survey:
@@ -155,6 +159,9 @@ id:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ id:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/is.yml b/config/locales/is.yml
index bc474cd07..bfaf4b6fb 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -131,6 +131,10 @@ is:
         header:
           from_with_name: '%{assignee_name} frá %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} frá %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ is:
     fullcontact:
       name: "Fullcontact"
       description: "FullContact samþætting hjálpar til við að auðga gestaprófíla. Þekkja notendur um leið og þeir deila netfangi sínu og bjóða þeim sérsniðna þjónustu. Tengdu FullContact við reikninginn þinn með því að deila FullContact API lykilnum."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ is:
       results_title: Search results
     hero:
       sub_title: Leitaðu að greinunum hér eða skoðaðu flokkana hér að neðan.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 0a68e552a..0f3f9fcab 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -131,6 +131,10 @@ it:
         header:
           from_with_name: '%{assignee_name} da %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} da %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nuovi messaggi in questa conversazione"
       transcript_subject: "Trascrizione della conversazione"
     survey:
@@ -155,6 +159,9 @@ it:
     fullcontact:
       name: "Fullcontact"
       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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ it:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articoli
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 710a88560..04481be2f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -131,6 +131,10 @@ ja:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "この会話に新着メッセージがあります"
       transcript_subject: "会話の記録"
     survey:
@@ -155,6 +159,9 @@ ja:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ja:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: ホーム
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index dffa39bbd..9ab73ee39 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -131,6 +131,10 @@ ka:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ ka:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ka:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index d6c4f0a0b..e9a926d38 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -131,6 +131,10 @@ ko:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ ko:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ko:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: 홈
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a6b7e7b75..c52417b7b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -131,6 +131,10 @@ lt:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ lt:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ lt:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 49d33a211..4b15dca11 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -131,6 +131,10 @@ lv:
         header:
           from_with_name: '%{assignee_name} no %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} no %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} no <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Jauni ziņojumi šajā sarunā"
       transcript_subject: "Sarunas Transkripts"
     survey:
@@ -155,6 +159,9 @@ lv:
     fullcontact:
       name: "Fullcontact"
       description: "FullContact integrācija palīdz bagātināt apmeklētāju profilus. Identificējiet lietotājus, tiklīdz viņi kopīgo savu e-pasta adresi, un piedāvājiet viņiem pielāgotu klientu apkalpošanu. Savienojiet FullContact ar savu kontu, kopīgojot FullContact API atslēgu."
+    google_translate:
+      name: "Google Tulkotājs"
+      description: "Atvieglojiet aģentiem ziņojumu tulkošanu, pievienojot Google tulkotāja integrāciju. Google tulkotājs palīdz automātiski identificēt valodu un pārvērst to aģenta/konta administratora izvēlētajā valodā."
   public_portal:
     search:
       search_placeholder: Meklēt rakstu pēc nosaukuma vai pamatteksta...
@@ -163,3 +170,14 @@ lv:
       results_title: Meklēšanas rezultāti
     hero:
       sub_title: Meklējiet rakstus šeit, vai pārlūkojiet tālāk norādītās kategorijas.
+    common:
+      home: Sākums
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: raksti
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 3a188cacb..1e7e376e5 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -131,6 +131,10 @@ ml:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "ഈ സംഭാഷണത്തിലെ പുതിയ സന്ദേശങ്ങൾ"
       transcript_subject: "സംഭാഷണ ട്രാൻസ്ക്രിപ്റ്റ്"
     survey:
@@ -155,6 +159,9 @@ ml:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ml:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: ഹോം
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a5bd86df8..309552e81 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -131,6 +131,10 @@ ms:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ ms:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ms:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 98ee902db..307b8d361 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -131,6 +131,10 @@ ne:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ ne:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ne:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index cc43a112e..08dabf0d9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -131,6 +131,10 @@ nl:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ nl:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ nl:
       results_title: Zoekresultaten
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Startpagina
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/no.yml b/config/locales/no.yml
index be8a83f59..8a2ba6608 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -131,6 +131,10 @@
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nye meldinger i denne samtalen"
       transcript_subject: "Kopi av samtale"
     survey:
@@ -155,6 +159,9 @@
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Hjem
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3860bde9a..8254b056c 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -131,6 +131,10 @@ pl:
         header:
           from_with_name: '%{assignee_name} z %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} z %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nowe wiadomości w tej dyskusji"
       transcript_subject: "Transkrypcja rozmowy"
     survey:
@@ -155,6 +159,9 @@ pl:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ pl:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index c769d6e04..38bf311de 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -131,6 +131,10 @@ pt:
         header:
           from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Novas mensagens nesta conversa"
       transcript_subject: "Transcrição da conversa"
     survey:
@@ -155,6 +159,9 @@ pt:
     fullcontact:
       name: "Fullcontact"
       description: "A integração com o FullContact ajuda a enriquecer os perfis dos seus visitantes. Identifica os utilizadores assim que eles partilham o seu endereço de e-mail e ofereça um atendimento ao cliente mais personalizado. Ligue a sua conta ao FullContact utilizando apenas a sua chave API."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ pt:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Principal
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 70f2d9cfe..7d5fbebc7 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -131,6 +131,10 @@ pt_BR:
         header:
           from_with_name: '%{assignee_name} de %{inbox_name} <reply+%{from_email}>'
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} do <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Novas mensagens nesta conversa"
       transcript_subject: "Transcrição da conversa"
     survey:
@@ -155,6 +159,9 @@ pt_BR:
     fullcontact:
       name: "Contato completo"
       description: "A integração de contatos completos ajuda a enriquecer perfis de visitantes. Identifique os usuários assim que eles compartilham seu endereço de e-mail e ofereça um atendimento ao cliente personalizado. Conecte seu FullContact à sua conta compartilhando a chave de API de Contato Fullcot."
+    google_translate:
+      name: "Tradutor do Google"
+      description: "Torne isso mais fácil para agentes traduzirem mensagens adicionando uma integração com o Tradutor do Google. O Tradutor do Google ajuda a identificar automaticamente o idioma e convertê-lo para o idioma escolhido pelo administrador de conta/agente."
   public_portal:
     search:
       search_placeholder: Pesquisar por artigo por título ou corpo...
@@ -163,3 +170,14 @@ pt_BR:
       results_title: Resultados de pesquisa
     hero:
       sub_title: Pesquise os artigos aqui ou navegue pelas categorias abaixo.
+    common:
+      home: Principal
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: artigos
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 985de9f34..b7ef52f11 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -131,6 +131,10 @@ ro:
         header:
           from_with_name: '%{assignee_name} din %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} din %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Mesaje noi în această conversație"
       transcript_subject: "Trimite Transcriere"
     survey:
@@ -155,6 +159,9 @@ ro:
     fullcontact:
       name: "Fullcontact"
       description: "Integrarea FullContact ajută la îmbogățirea profilurilor vizitatorilor. Identificați utilizatorii imediat ce își partajează adresa de e-mail și oferiți-le servicii personalizate pentru clienți. Conectați FullContact la contul dvs., partajând cheia API FullContact."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ro:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Acasa
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articole
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b64a685db..527e8fca2 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -131,6 +131,10 @@ ru:
         header:
           from_with_name: '%{assignee_name} от %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} от %{inbox_name} <%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} от <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Новые сообщения в этом диалоге"
       transcript_subject: "Субтитры общения"
     survey:
@@ -155,6 +159,9 @@ ru:
     fullcontact:
       name: "Полная карточка контакта"
       description: "Интеграция с FullContact помогает получить всю информацию о профиле посетителей. Определяйте пользователей как только они поделится своим электронным адресом и предложите им индивидуальное обслуживание клиентов. Подключите ваш FullContact к своей учетной записи, поделившись API ключом FullContact."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Поиск статьи по названию или содержанию...
@@ -163,3 +170,14 @@ ru:
       results_title: Результаты поиска
     hero:
       sub_title: Ищите здесь статьи или выберите категории, указанные ниже.
+    common:
+      home: Главная
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: статьи
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 74cf8d370..b2369e20d 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -131,6 +131,10 @@ sk:
         header:
           from_with_name: '%{assignee_name} z %{inbox_name} <reply+%{from_email}>'
           reply_with_name: '%{assignee_name} z %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nové správy v tejto konverzácii"
       transcript_subject: "Prepis konverzácie"
     survey:
@@ -155,6 +159,9 @@ sk:
     fullcontact:
       name: "Fullcontact"
       description: "Integrácia so službou FullContact pomáha obohatiť profily návštevníkov. Identifikujte používateľov hneď, ako zdieľajú svoju e-mailovú adresu, a ponúknite im zákaznícky servis šitý na mieru. Pripojte aplikáciu FullContact k svojmu účtu zdieľaním kľúča API FullContact."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ sk:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 5a17c7c0c..66c8988f6 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -131,6 +131,10 @@ sr-Latn:
         header:
           from_with_name: '%{assignee_name} iz %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} iz %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nove poruke u ovom razgovoru"
       transcript_subject: "Transkript razgovora"
     survey:
@@ -155,6 +159,9 @@ sr-Latn:
     fullcontact:
       name: "Fullcontact"
       description: "FullContact integracija pomaže vam da obogatite profile posetilaca. Identifikujte korisnike čim podele njihovu adresu e-pošte i ponudite im prilagođenu korisničku podršku. Povežite vaš FullContact sa vašim nalogom deljenjem FullContact API ključa."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ sr-Latn:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Početak
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: članci
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 57951284f..501e70da4 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -131,6 +131,10 @@ sv:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nya meddelanden i denna konversation"
       transcript_subject: "Konversationstranskribering"
     survey:
@@ -155,6 +159,9 @@ sv:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ sv:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Hem
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index d60dbcfff..6a4c01661 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -131,6 +131,10 @@ ta:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "இந்த உரையாடலில் புதிய செய்திகள்"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ ta:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ta:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: முகப்பு
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f2eb3bd6f..a15d6cc0f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -131,6 +131,10 @@ th:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ th:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ th:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: หน้าหลัก
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: บทความ
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index de9264115..b53e1248f 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -131,6 +131,10 @@ tr:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Bu görüşmedeki yeni mesajlar"
       transcript_subject: "Konuşma Metni"
     survey:
@@ -155,6 +159,9 @@ tr:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ tr:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Anasayfa
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index eb17b1db6..0d85549a7 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -131,6 +131,10 @@ uk:
         header:
           from_with_name: '%{assignee_name} з %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} від %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Нові повідомлення в цьому діалозі"
       transcript_subject: "Транскрипція діалогу"
     survey:
@@ -155,6 +159,9 @@ uk:
     fullcontact:
       name: "Fullcontact"
       description: "Інтеграція FullContact допомагає збагачувати профілі відвідувачів. Визначте користувачів, як тільки вони поділяться адресою електронної пошти та пропонують їм адаптовану службу клієнтів. Під'єднайте ваш FullContact до вашого аккаунту, поділившись ключем FullContact API."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Пошук статті за заголовком або змістом...
@@ -163,3 +170,14 @@ uk:
       results_title: Результати пошуку
     hero:
       sub_title: Шукайте тут або перегляньте категорії нижче.
+    common:
+      home: Головна
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: статті
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index ecdedefc7..fd7d79e5e 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -131,6 +131,10 @@ ur:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ ur:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ur:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 5eb302471..2f8264fed 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -131,6 +131,10 @@ ur:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ ur:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ ur:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 1217f0132..81f2ccadd 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -131,6 +131,10 @@ vi:
         header:
           from_with_name: '%{assignee_name} từ %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} từ %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_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:
@@ -155,6 +159,9 @@ vi:
     fullcontact:
       name: "Fullcontact"
       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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Tìm bài viết theo tiêu đề hoặc nội dung...
@@ -163,3 +170,14 @@ vi:
       results_title: Các kết quả tìm kiếm
     hero:
       sub_title: Tìm trong bài viết hoặc xem danh mục dưới đây.
+    common:
+      home: Trang Chủ
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: các bài
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index e609b6dcd..b6ffa0185 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -131,6 +131,10 @@ zh_CN:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "此对话中的新消息"
       transcript_subject: "Conversation Transcript"
     survey:
@@ -155,6 +159,9 @@ zh_CN:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ zh_CN:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: 首页
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: 文章
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 292d7c0ed..262c4f98e 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -131,6 +131,10 @@ zh_TW:
         header:
           from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "在對話中的新訊息"
       transcript_subject: "對話紀錄"
     survey:
@@ -155,6 +159,9 @@ zh_TW:
     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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
@@ -163,3 +170,14 @@ zh_TW:
       results_title: Search results
     hero:
       sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: 首頁
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site

From 42d9b6ffed348c0f12fe4589740acac0b1c898cf Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Tue, 28 Feb 2023 12:18:06 +0530
Subject: [PATCH 37/94] chore: upload log artifact in nightly gh action (#6513)

---
 .github/workflows/nightly_installer.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/nightly_installer.yml b/.github/workflows/nightly_installer.yml
index 6b076cd8a..034c08e8c 100644
--- a/.github/workflows/nightly_installer.yml
+++ b/.github/workflows/nightly_installer.yml
@@ -44,3 +44,9 @@ jobs:
         #        sudo systemctl restart chatwoot.target
         #        curl http://localhost:3000/api
 
+    - name: Upload chatwoot setup log file as an artifact
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: chatwoot-setup-log-file
+        path: /var/log/chatwoot-setup.log

From d5a2756462bd3df534701e12de7d5b070c357c29 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 28 Feb 2023 13:57:05 +0530
Subject: [PATCH 38/94] feat: Add the option for consent form (#6511)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .vscode/settings.json                         |  7 ++++-
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  3 +-
 .../settings/inbox/PreChatForm/Settings.vue   | 29 ++++++++++++++-----
 .../widget/components/PreChat/Form.vue        | 24 ++++++++-------
 app/javascript/widget/i18n/locale/en.json     |  3 +-
 5 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9e26dfeeb..b3cfaee50 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1 +1,6 @@
-{}
\ No newline at end of file
+{
+    "cSpell.words": [
+        "chatwoot",
+        "dompurify"
+    ]
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 669f07946..87ec7a845 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
index 9862c053c..900d1c1e9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
@@ -16,17 +16,19 @@
         </select>
       </label>
       <div v-if="preChatFormEnabled">
-        <label class="medium-3 columns">
-          {{ $t('INBOX_MGMT.PRE_CHAT_FORM.PRE_CHAT_MESSAGE.LABEL') }}
-          <textarea
-            v-model.trim="preChatMessage"
-            type="text"
+        <label class="columns medium-8  large-8">
+          <label>
+            {{ $t('INBOX_MGMT.PRE_CHAT_FORM.PRE_CHAT_MESSAGE.LABEL') }}
+          </label>
+          <woot-message-editor
+            v-model="preChatMessage"
+            class="message-editor"
             :placeholder="
               $t('INBOX_MGMT.PRE_CHAT_FORM.PRE_CHAT_MESSAGE.PLACEHOLDER')
             "
           />
         </label>
-        <div class="medium-8 columns">
+        <div class="columns medium-8  large-8 pre-chat-fields">
           <label>{{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS') }}</label>
           <table class="table table-striped w-full">
             <thead class="thead-dark">
@@ -65,7 +67,10 @@
         </div>
       </div>
       <woot-submit-button
-        :button-text="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
+        class="submit-button"
+        :button-text="
+          $t('INBOX_MGMT.SETTINGS_POPUP.UPDATE_PRE_CHAT_FORM_SETTINGS')
+        "
         :loading="uiFlags.isUpdating"
       />
     </form>
@@ -76,10 +81,11 @@ import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import PreChatFields from './PreChatFields.vue';
 import { getPreChatFields, standardFieldKeys } from 'dashboard/helper/preChat';
-
+import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 export default {
   components: {
     PreChatFields,
+    WootMessageEditor,
   },
   mixins: [alertMixin],
   props: {
@@ -171,4 +177,11 @@ export default {
 .pre-chat--title {
   margin: var(--space-medium) 0 var(--space-slab);
 }
+
+.submit-button {
+  margin-top: var(--space-normal);
+}
+.pre-chat-fields {
+  margin-top: var(--space-normal);
+}
 </style>
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index 1d9eb6dd0..92800dfc9 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -6,11 +6,10 @@
   >
     <div
       v-if="shouldShowHeaderMessage"
-      class="mb-4 text-sm leading-5"
+      v-dompurify-html="formatMessage(headerMessage, false)"
+      class="mb-4 text-sm leading-5 pre-chat-header-message"
       :class="$dm('text-black-800', 'dark:text-slate-50')"
-    >
-      {{ headerMessage }}
-    </div>
+    />
     <FormulateInput
       v-for="item in enabledPreChatFields"
       :key="item.name"
@@ -25,7 +24,7 @@
       :validation-messages="{
         isPhoneE164OrEmpty: $t('PRE_CHAT_FORM.FIELDS.PHONE_NUMBER.VALID_ERROR'),
         email: $t('PRE_CHAT_FORM.FIELDS.EMAIL_ADDRESS.VALID_ERROR'),
-        required: getRequiredErrorMessage(item),
+        required: $t('PRE_CHAT_FORM.REQUIRED'),
       }"
     />
     <FormulateInput
@@ -60,7 +59,7 @@ import CustomButton from 'shared/components/Button';
 import Spinner from 'shared/components/Spinner';
 import { mapGetters } from 'vuex';
 import { getContrastingTextColor } from '@chatwoot/utils';
-
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import { isEmptyObject } from 'widget/helpers/utils';
 import routerMixin from 'widget/mixins/routerMixin';
 import darkModeMixin from 'widget/mixins/darkModeMixin';
@@ -69,7 +68,7 @@ export default {
     CustomButton,
     Spinner,
   },
-  mixins: [routerMixin, darkModeMixin],
+  mixins: [routerMixin, darkModeMixin, messageFormatterMixin],
   props: {
     options: {
       type: Object,
@@ -224,10 +223,6 @@ export default {
       }
       return this.formValues[name] || null;
     },
-
-    getRequiredErrorMessage({ label }) {
-      return `${label} ${this.$t('PRE_CHAT_FORM.IS_REQUIRED')}`;
-    },
     getValidation({ type, name }) {
       if (!this.isContactFieldRequired(name)) {
         return '';
@@ -290,6 +285,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import '~widget/assets/scss/variables.scss';
 ::v-deep {
   .wrapper[data-type='checkbox'] {
     .formulate-input-wrapper {
@@ -318,5 +314,11 @@ export default {
       }
     }
   }
+  .pre-chat-header-message {
+    .link {
+      color: $color-woot;
+      text-decoration: underline;
+    }
+  }
 }
 </style>
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index 141e9b102..0c286263d 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {

From 9bd47588fcdd186ce39cd58cfe20952a55882331 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 28 Feb 2023 16:12:08 +0530
Subject: [PATCH 39/94] bug: Fixes i18n is not working on the help center
 dashboard (#6562)

---
 app/javascript/dashboard/i18n/locale/ar/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/bg/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ca/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/cs/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/da/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/de/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/el/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/es/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/fa/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/fi/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/fr/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/he/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/hi/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/hu/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/id/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/it/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ja/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ko/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/lv/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ml/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ne/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/nl/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/no/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/pl/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/pt/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/pt_BR/index.js             | 2 ++
 app/javascript/dashboard/i18n/locale/ro/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ru/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/sk/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/sr/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/sv/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ta/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/th/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/tr/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/uk/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ur/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/ur_IN/index.js             | 2 ++
 app/javascript/dashboard/i18n/locale/vi/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/zh/index.js                | 2 ++
 app/javascript/dashboard/i18n/locale/zh_CN/index.js             | 2 ++
 app/javascript/dashboard/i18n/locale/zh_TW/index.js             | 2 ++
 .../dashboard/helpcenter/components/Header/ArticleHeader.vue    | 2 +-
 .../routes/dashboard/helpcenter/components/PortalListItem.vue   | 2 +-
 .../dashboard/helpcenter/pages/portals/ListAllPortals.vue       | 2 +-
 44 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/index.js b/app/javascript/dashboard/i18n/locale/ar/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ar/index.js
+++ b/app/javascript/dashboard/i18n/locale/ar/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/bg/index.js b/app/javascript/dashboard/i18n/locale/bg/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/bg/index.js
+++ b/app/javascript/dashboard/i18n/locale/bg/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ca/index.js b/app/javascript/dashboard/i18n/locale/ca/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ca/index.js
+++ b/app/javascript/dashboard/i18n/locale/ca/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/cs/index.js b/app/javascript/dashboard/i18n/locale/cs/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/cs/index.js
+++ b/app/javascript/dashboard/i18n/locale/cs/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/da/index.js b/app/javascript/dashboard/i18n/locale/da/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/da/index.js
+++ b/app/javascript/dashboard/i18n/locale/da/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/de/index.js b/app/javascript/dashboard/i18n/locale/de/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/de/index.js
+++ b/app/javascript/dashboard/i18n/locale/de/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/el/index.js b/app/javascript/dashboard/i18n/locale/el/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/el/index.js
+++ b/app/javascript/dashboard/i18n/locale/el/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/es/index.js b/app/javascript/dashboard/i18n/locale/es/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/es/index.js
+++ b/app/javascript/dashboard/i18n/locale/es/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fa/index.js b/app/javascript/dashboard/i18n/locale/fa/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/fa/index.js
+++ b/app/javascript/dashboard/i18n/locale/fa/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fi/index.js b/app/javascript/dashboard/i18n/locale/fi/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/fi/index.js
+++ b/app/javascript/dashboard/i18n/locale/fi/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fr/index.js b/app/javascript/dashboard/i18n/locale/fr/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/fr/index.js
+++ b/app/javascript/dashboard/i18n/locale/fr/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/he/index.js b/app/javascript/dashboard/i18n/locale/he/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/he/index.js
+++ b/app/javascript/dashboard/i18n/locale/he/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hi/index.js b/app/javascript/dashboard/i18n/locale/hi/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/hi/index.js
+++ b/app/javascript/dashboard/i18n/locale/hi/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hu/index.js b/app/javascript/dashboard/i18n/locale/hu/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/hu/index.js
+++ b/app/javascript/dashboard/i18n/locale/hu/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/id/index.js b/app/javascript/dashboard/i18n/locale/id/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/id/index.js
+++ b/app/javascript/dashboard/i18n/locale/id/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/it/index.js b/app/javascript/dashboard/i18n/locale/it/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/it/index.js
+++ b/app/javascript/dashboard/i18n/locale/it/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ja/index.js b/app/javascript/dashboard/i18n/locale/ja/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ja/index.js
+++ b/app/javascript/dashboard/i18n/locale/ja/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ko/index.js b/app/javascript/dashboard/i18n/locale/ko/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ko/index.js
+++ b/app/javascript/dashboard/i18n/locale/ko/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/lv/index.js b/app/javascript/dashboard/i18n/locale/lv/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/lv/index.js
+++ b/app/javascript/dashboard/i18n/locale/lv/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ml/index.js b/app/javascript/dashboard/i18n/locale/ml/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ml/index.js
+++ b/app/javascript/dashboard/i18n/locale/ml/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ne/index.js b/app/javascript/dashboard/i18n/locale/ne/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ne/index.js
+++ b/app/javascript/dashboard/i18n/locale/ne/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/nl/index.js b/app/javascript/dashboard/i18n/locale/nl/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/nl/index.js
+++ b/app/javascript/dashboard/i18n/locale/nl/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/no/index.js b/app/javascript/dashboard/i18n/locale/no/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/no/index.js
+++ b/app/javascript/dashboard/i18n/locale/no/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pl/index.js b/app/javascript/dashboard/i18n/locale/pl/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/pl/index.js
+++ b/app/javascript/dashboard/i18n/locale/pl/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pt/index.js b/app/javascript/dashboard/i18n/locale/pt/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/pt/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/index.js b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ro/index.js b/app/javascript/dashboard/i18n/locale/ro/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ro/index.js
+++ b/app/javascript/dashboard/i18n/locale/ro/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ru/index.js b/app/javascript/dashboard/i18n/locale/ru/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ru/index.js
+++ b/app/javascript/dashboard/i18n/locale/ru/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sk/index.js b/app/javascript/dashboard/i18n/locale/sk/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/sk/index.js
+++ b/app/javascript/dashboard/i18n/locale/sk/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sr/index.js b/app/javascript/dashboard/i18n/locale/sr/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/sr/index.js
+++ b/app/javascript/dashboard/i18n/locale/sr/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sv/index.js b/app/javascript/dashboard/i18n/locale/sv/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/sv/index.js
+++ b/app/javascript/dashboard/i18n/locale/sv/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ta/index.js b/app/javascript/dashboard/i18n/locale/ta/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ta/index.js
+++ b/app/javascript/dashboard/i18n/locale/ta/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/th/index.js b/app/javascript/dashboard/i18n/locale/th/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/th/index.js
+++ b/app/javascript/dashboard/i18n/locale/th/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/tr/index.js b/app/javascript/dashboard/i18n/locale/tr/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/tr/index.js
+++ b/app/javascript/dashboard/i18n/locale/tr/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/uk/index.js b/app/javascript/dashboard/i18n/locale/uk/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/uk/index.js
+++ b/app/javascript/dashboard/i18n/locale/uk/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ur/index.js b/app/javascript/dashboard/i18n/locale/ur/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ur/index.js
+++ b/app/javascript/dashboard/i18n/locale/ur/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/index.js b/app/javascript/dashboard/i18n/locale/ur_IN/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/index.js
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/vi/index.js b/app/javascript/dashboard/i18n/locale/vi/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/vi/index.js
+++ b/app/javascript/dashboard/i18n/locale/vi/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh/index.js b/app/javascript/dashboard/i18n/locale/zh/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/zh/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/index.js b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/index.js b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
index 9b8773a64..9f880ea92 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
@@ -23,6 +23,7 @@ import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
 import { default as _whatsappTemplates } from './whatsappTemplates.json';
+import { default as _helpCenter } from './helpCenter.json';
 
 export default {
   ..._advancedFilters,
@@ -50,4 +51,5 @@ export default {
   ..._teamsSettings,
   ..._whatsappTemplates,
   ..._bulkActions,
+  ..._helpCenter,
 };
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
index 7d032dac8..0f148211a 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -165,7 +165,7 @@ export default {
   .header-title {
     display: flex;
     align-items: center;
-    margin: 0 var(--space-smaller);
+    margin: 0 var(--space-small);
     .page-title {
       margin-bottom: 0;
     }
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItem.vue
index 794cf6e9d..55382c934 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItem.vue
@@ -389,7 +389,7 @@ export default {
         display: flex;
         align-items: center;
         .status {
-          margin: 0 0 0 var(--space-small);
+          margin: 0 var(--space-small);
         }
       }
       .portal-title {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
index f86da78ad..4e4b592c6 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
@@ -122,7 +122,7 @@ export default {
       display: flex;
       align-items: center;
       .page-title {
-        margin: 0 var(--space-smaller) 0;
+        margin: 0 var(--space-small) 0;
       }
     }
   }

From d4e7eaeccebbb000ae84863380464cd1a8bc51bc Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 28 Feb 2023 22:00:36 +0530
Subject: [PATCH 40/94] feat: New APIs for search (#6564)

- Adding new API endpoints for search
- Migrations to add appropriate indexes
---
 .../api/v1/accounts/search_controller.rb      |  28 +++++
 app/jobs/migration/add_search_indexes_job.rb  |  17 +++
 app/models/contact.rb                         |   9 +-
 app/models/message.rb                         |   2 +
 app/services/search_service.rb                |  43 +++++++
 .../v1/accounts/search/_agent.json.jbuilder   |   5 +
 .../v1/accounts/search/_contact.json.jbuilder |   5 +
 .../v1/accounts/search/_inbox.json.jbuilder   |   4 +
 .../v1/accounts/search/_message.json.jbuilder |  14 +++
 .../v1/accounts/search/contacts.json.jbuilder |   7 ++
 .../search/conversations.json.jbuilder        |  21 ++++
 .../v1/accounts/search/index.json.jbuilder    |  32 +++++
 .../v1/accounts/search/messages.json.jbuilder |   7 ++
 config/routes.rb                              |   8 ++
 ...4124632_add_index_for_search_operations.rb |   6 +
 db/schema.rb                                  |   6 +-
 .../api/v1/accounts/search_controller_spec.rb | 118 ++++++++++++++++++
 spec/services/search_service_spec.rb          |  96 ++++++++++++++
 18 files changed, 423 insertions(+), 5 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/search_controller.rb
 create mode 100644 app/jobs/migration/add_search_indexes_job.rb
 create mode 100644 app/services/search_service.rb
 create mode 100644 app/views/api/v1/accounts/search/_agent.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/search/_contact.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/search/_inbox.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/search/_message.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/search/contacts.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/search/conversations.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/search/index.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/search/messages.json.jbuilder
 create mode 100644 db/migrate/20230224124632_add_index_for_search_operations.rb
 create mode 100644 spec/controllers/api/v1/accounts/search_controller_spec.rb
 create mode 100644 spec/services/search_service_spec.rb

diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb
new file mode 100644
index 000000000..35979f70f
--- /dev/null
+++ b/app/controllers/api/v1/accounts/search_controller.rb
@@ -0,0 +1,28 @@
+class Api::V1::Accounts::SearchController < Api::V1::Accounts::BaseController
+  def index
+    @result = search('all')
+  end
+
+  def conversations
+    @result = search('Conversation')
+  end
+
+  def contacts
+    @result = search('Contact')
+  end
+
+  def messages
+    @result = search('Message')
+  end
+
+  private
+
+  def search(search_type)
+    SearchService.new(
+      current_user: Current.user,
+      current_account: Current.account,
+      search_type: search_type,
+      params: params
+    ).perform
+  end
+end
diff --git a/app/jobs/migration/add_search_indexes_job.rb b/app/jobs/migration/add_search_indexes_job.rb
new file mode 100644
index 000000000..c5c727203
--- /dev/null
+++ b/app/jobs/migration/add_search_indexes_job.rb
@@ -0,0 +1,17 @@
+# Delete migration and spec after 2 consecutive releases.
+class Migration::AddSearchIndexesJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform
+    ActiveRecord::Migration[6.1].add_index(:messages, [:account_id, :inbox_id], algorithm: :concurrently)
+    ActiveRecord::Migration[6.1].add_index(:messages, :content, using: 'gin', opclass: :gin_trgm_ops, algorithm: :concurrently)
+    ActiveRecord::Migration[6.1].add_index(
+      :contacts,
+      [:name, :email, :phone_number, :identifier],
+      using: 'gin',
+      opclass: :gin_trgm_ops,
+      name: 'index_contacts_on_name_email_phone_number_identifier',
+      algorithm: :concurrently
+    )
+  end
+end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index ec6053eb5..83019b969 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -16,10 +16,11 @@
 #
 # Indexes
 #
-#  index_contacts_on_account_id                   (account_id)
-#  index_contacts_on_phone_number_and_account_id  (phone_number,account_id)
-#  uniq_email_per_account_contact                 (email,account_id) UNIQUE
-#  uniq_identifier_per_account_contact            (identifier,account_id) UNIQUE
+#  index_contacts_on_account_id                          (account_id)
+#  index_contacts_on_name_email_phone_number_identifier  (name,email,phone_number,identifier) USING gin
+#  index_contacts_on_phone_number_and_account_id         (phone_number,account_id)
+#  uniq_email_per_account_contact                        (email,account_id) UNIQUE
+#  uniq_identifier_per_account_contact                   (identifier,account_id) UNIQUE
 #
 
 class Contact < ApplicationRecord
diff --git a/app/models/message.rb b/app/models/message.rb
index 40f4af757..01b385f27 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -23,7 +23,9 @@
 # Indexes
 #
 #  index_messages_on_account_id                         (account_id)
+#  index_messages_on_account_id_and_inbox_id            (account_id,inbox_id)
 #  index_messages_on_additional_attributes_campaign_id  (((additional_attributes -> 'campaign_id'::text))) USING gin
+#  index_messages_on_content                            (content) USING gin
 #  index_messages_on_conversation_id                    (conversation_id)
 #  index_messages_on_inbox_id                           (inbox_id)
 #  index_messages_on_sender_type_and_sender_id          (sender_type,sender_id)
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
new file mode 100644
index 000000000..77994c26f
--- /dev/null
+++ b/app/services/search_service.rb
@@ -0,0 +1,43 @@
+class SearchService
+  pattr_initialize [:current_user!, :current_account!, :params!, :search_type!]
+
+  def perform
+    case search_type
+    when 'Message'
+      { messages: filter_messages }
+    when 'Conversation'
+      { conversations: filter_conversations }
+    when 'Contact'
+      { contacts: filter_contacts }
+    else
+      { contacts: filter_contacts, messages: filter_messages, conversations: filter_conversations }
+    end
+  end
+
+  private
+
+  def accessable_inbox_ids
+    @accessable_inbox_ids ||= @current_user.assigned_inboxes.pluck(:id)
+  end
+
+  def filter_conversations
+    @conversations = current_account.conversations.where(inbox_id: accessable_inbox_ids)
+                                    .joins('INNER JOIN contacts ON conversations.contact_id = contacts.id')
+                                    .where("cast(conversations.display_id as text) ILIKE :search OR contacts.name ILIKE :search OR contacts.email
+                            ILIKE :search OR contacts.phone_number ILIKE :search OR contacts.identifier ILIKE :search", search: "%#{params[:q]}%")
+                                    .limit(10)
+  end
+
+  def filter_messages
+    @messages = current_account.messages.where(inbox_id: accessable_inbox_ids)
+                               .where('messages.content ILIKE :search', search: "%#{params[:q]}%")
+                               .where('created_at >= ?', 3.months.ago).limit(10)
+  end
+
+  def filter_contacts
+    @contacts = current_account.contacts.where(
+      "name ILIKE :search OR email ILIKE :search OR phone_number
+      ILIKE :search OR identifier ILIKE :search", search: "%#{params[:q]}%"
+    ).limit(10)
+  end
+end
diff --git a/app/views/api/v1/accounts/search/_agent.json.jbuilder b/app/views/api/v1/accounts/search/_agent.json.jbuilder
new file mode 100644
index 000000000..98a9e2c08
--- /dev/null
+++ b/app/views/api/v1/accounts/search/_agent.json.jbuilder
@@ -0,0 +1,5 @@
+json.id agent.id
+json.available_name agent.available_name
+json.email agent.email
+json.name agent.name
+json.role agent.role
diff --git a/app/views/api/v1/accounts/search/_contact.json.jbuilder b/app/views/api/v1/accounts/search/_contact.json.jbuilder
new file mode 100644
index 000000000..8d6ebcc96
--- /dev/null
+++ b/app/views/api/v1/accounts/search/_contact.json.jbuilder
@@ -0,0 +1,5 @@
+json.email contact.email
+json.id contact.id
+json.name contact.name
+json.phone_number contact.phone_number
+json.identifier contact.identifier
diff --git a/app/views/api/v1/accounts/search/_inbox.json.jbuilder b/app/views/api/v1/accounts/search/_inbox.json.jbuilder
new file mode 100644
index 000000000..a5f9e8b63
--- /dev/null
+++ b/app/views/api/v1/accounts/search/_inbox.json.jbuilder
@@ -0,0 +1,4 @@
+json.id inbox.id
+json.channel_id inbox.channel_id
+json.name inbox.name
+json.channel_type inbox.channel_type
diff --git a/app/views/api/v1/accounts/search/_message.json.jbuilder b/app/views/api/v1/accounts/search/_message.json.jbuilder
new file mode 100644
index 000000000..a5e7bce42
--- /dev/null
+++ b/app/views/api/v1/accounts/search/_message.json.jbuilder
@@ -0,0 +1,14 @@
+json.id message.id
+json.content message.content
+json.message_type message.message_type_before_type_cast
+json.content_type message.content_type
+json.source_id message.source_id
+json.inbox_id message.inbox_id
+json.conversation_id message.conversation.try(:display_id)
+json.created_at message.created_at.to_i
+json.agent do
+  json.partial! 'agent', formats: [:json], agent: message.conversation.try(:assignee) if message.conversation.try(:assignee).present?
+end
+json.inbox do
+  json.partial! 'inbox', formats: [:json], inbox: message.inbox if message.inbox.present? && message.try(:inbox).present?
+end
diff --git a/app/views/api/v1/accounts/search/contacts.json.jbuilder b/app/views/api/v1/accounts/search/contacts.json.jbuilder
new file mode 100644
index 000000000..505b50273
--- /dev/null
+++ b/app/views/api/v1/accounts/search/contacts.json.jbuilder
@@ -0,0 +1,7 @@
+json.payload do
+  json.contacts do
+    json.array! @result[:contacts] do |contact|
+      json.partial! 'contact', formats: [:json], contact: contact
+    end
+  end
+end
diff --git a/app/views/api/v1/accounts/search/conversations.json.jbuilder b/app/views/api/v1/accounts/search/conversations.json.jbuilder
new file mode 100644
index 000000000..570cf3b4c
--- /dev/null
+++ b/app/views/api/v1/accounts/search/conversations.json.jbuilder
@@ -0,0 +1,21 @@
+json.payload do
+  json.conversations do
+    json.array! @result[:conversations] do |conversation|
+      json.id conversation.display_id
+      json.account_id conversation.account_id
+      json.created_at conversation.created_at.to_i
+      json.message do
+        json.partial! 'message', formats: [:json], message: conversation.messages.try(:first)
+      end
+      json.contact do
+        json.partial! 'contact', formats: [:json], contact: conversation.contact if conversation.try(:contact).present?
+      end
+      json.inbox do
+        json.partial! 'inbox', formats: [:json], inbox: conversation.inbox if conversation.try(:inbox).present?
+      end
+      json.agent do
+        json.partial! 'agent', formats: [:json], agent: conversation.assignee if conversation.try(:assignee).present?
+      end
+    end
+  end
+end
diff --git a/app/views/api/v1/accounts/search/index.json.jbuilder b/app/views/api/v1/accounts/search/index.json.jbuilder
new file mode 100644
index 000000000..1c6e86284
--- /dev/null
+++ b/app/views/api/v1/accounts/search/index.json.jbuilder
@@ -0,0 +1,32 @@
+json.payload do
+  json.conversations do
+    json.array! @result[:conversations] do |conversation|
+      json.id conversation.display_id
+      json.account_id conversation.account_id
+      json.created_at conversation.created_at.to_i
+      json.message do
+        json.partial! 'message', formats: [:json], message: conversation.messages.try(:first)
+      end
+      json.contact do
+        json.partial! 'contact', formats: [:json], contact: conversation.contact if conversation.try(:contact).present?
+      end
+      json.inbox do
+        json.partial! 'inbox', formats: [:json], inbox: conversation.inbox if conversation.try(:inbox).present?
+      end
+      json.agent do
+        json.partial! 'agent', formats: [:json], agent: conversation.assignee if conversation.try(:assignee).present?
+      end
+    end
+  end
+  json.contacts do
+    json.array! @result[:contacts] do |contact|
+      json.partial! 'contact', formats: [:json], contact: contact
+    end
+  end
+
+  json.messages do
+    json.array! @result[:messages] do |message|
+      json.partial! 'message', formats: [:json], message: message
+    end
+  end
+end
diff --git a/app/views/api/v1/accounts/search/messages.json.jbuilder b/app/views/api/v1/accounts/search/messages.json.jbuilder
new file mode 100644
index 000000000..1bd024dca
--- /dev/null
+++ b/app/views/api/v1/accounts/search/messages.json.jbuilder
@@ -0,0 +1,7 @@
+json.payload do
+  json.messages do
+    json.array! @result[:messages] do |message|
+      json.partial! 'message', formats: [:json], message: message
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 0ac64012e..d318d6fa8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -96,6 +96,14 @@ Rails.application.routes.draw do
             end
           end
 
+          resources :search, only: [:index] do
+            collection do
+              get :conversations
+              get :messages
+              get :contacts
+            end
+          end
+
           resources :contacts, only: [:index, :show, :update, :create, :destroy] do
             collection do
               get :active
diff --git a/db/migrate/20230224124632_add_index_for_search_operations.rb b/db/migrate/20230224124632_add_index_for_search_operations.rb
new file mode 100644
index 000000000..77386a50c
--- /dev/null
+++ b/db/migrate/20230224124632_add_index_for_search_operations.rb
@@ -0,0 +1,6 @@
+class AddIndexForSearchOperations < ActiveRecord::Migration[6.1]
+  def change
+    enable_extension('pg_trgm')
+    Migration::AddSearchIndexesJob.perform_later
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bd4e95b2a..a9b7217ca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,10 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_02_14_025901) do
+ActiveRecord::Schema.define(version: 2023_02_24_124632) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
+  enable_extension "pg_trgm"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
@@ -385,6 +386,7 @@ ActiveRecord::Schema.define(version: 2023_02_14_025901) do
     t.index ["account_id"], name: "index_contacts_on_account_id"
     t.index ["email", "account_id"], name: "uniq_email_per_account_contact", unique: true
     t.index ["identifier", "account_id"], name: "uniq_identifier_per_account_contact", unique: true
+    t.index ["name", "email", "phone_number", "identifier"], name: "index_contacts_on_name_email_phone_number_identifier", opclass: :gin_trgm_ops, using: :gin
     t.index ["phone_number", "account_id"], name: "index_contacts_on_phone_number_and_account_id"
   end
 
@@ -631,7 +633,9 @@ ActiveRecord::Schema.define(version: 2023_02_14_025901) do
     t.jsonb "external_source_ids", default: {}
     t.jsonb "additional_attributes", default: {}
     t.index "((additional_attributes -> 'campaign_id'::text))", name: "index_messages_on_additional_attributes_campaign_id", using: :gin
+    t.index ["account_id", "inbox_id"], name: "index_messages_on_account_id_and_inbox_id"
     t.index ["account_id"], name: "index_messages_on_account_id"
+    t.index ["content"], name: "index_messages_on_content", opclass: :gin_trgm_ops, using: :gin
     t.index ["conversation_id"], name: "index_messages_on_conversation_id"
     t.index ["inbox_id"], name: "index_messages_on_inbox_id"
     t.index ["sender_type", "sender_id"], name: "index_messages_on_sender_type_and_sender_id"
diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb
new file mode 100644
index 000000000..d12898d9e
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/search_controller_spec.rb
@@ -0,0 +1,118 @@
+require 'rails_helper'
+
+RSpec.describe 'Search', type: :request do
+  let(:account) { create(:account) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+
+  before do
+    contact = create(:contact, email: 'test@example.com', account: account)
+    conversation = create(:conversation, account: account, contact_id: contact.id)
+    create(:message, conversation: conversation, account: account, content: 'test1')
+    create(:message, conversation: conversation, account: account, content: 'test2')
+    create(:contact_inbox, contact_id: contact.id, inbox_id: conversation.inbox.id)
+    create(:inbox_member, user: agent, inbox: conversation.inbox)
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/search' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/search", params: { q: 'test' }
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns all conversations with messages containing the search query' do
+        get "/api/v1/accounts/#{account.id}/search",
+            headers: agent.create_new_auth_token,
+            params: { q: 'test' },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+
+        expect(response_data[:payload][:messages].first[:content]).to eq 'test1'
+        expect(response_data[:payload].keys).to match_array [:contacts, :conversations, :messages]
+        expect(response_data[:payload][:messages].length).to eq 2
+        expect(response_data[:payload][:conversations].length).to eq 1
+        expect(response_data[:payload][:contacts].length).to eq 1
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/search/contacts' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/search/contacts", params: { q: 'test' }
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns all conversations with messages containing the search query' do
+        get "/api/v1/accounts/#{account.id}/search/contacts",
+            headers: agent.create_new_auth_token,
+            params: { q: 'test' },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+
+        expect(response_data[:payload].keys).to match_array [:contacts]
+        expect(response_data[:payload][:contacts].length).to eq 1
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/search/conversations' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/search/conversations", params: { q: 'test' }
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns all conversations with messages containing the search query' do
+        get "/api/v1/accounts/#{account.id}/search/conversations",
+            headers: agent.create_new_auth_token,
+            params: { q: 'test' },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+
+        expect(response_data[:payload].keys).to match_array [:conversations]
+        expect(response_data[:payload][:conversations].length).to eq 1
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/search/messages' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/search/messages", params: { q: 'test' }
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns all conversations with messages containing the search query' do
+        get "/api/v1/accounts/#{account.id}/search/messages",
+            headers: agent.create_new_auth_token,
+            params: { q: 'test' },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+
+        expect(response_data[:payload].keys).to match_array [:messages]
+        expect(response_data[:payload][:messages].length).to eq 2
+      end
+    end
+  end
+end
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
new file mode 100644
index 000000000..1419eeac6
--- /dev/null
+++ b/spec/services/search_service_spec.rb
@@ -0,0 +1,96 @@
+require 'rails_helper'
+
+describe ::SearchService do
+  subject(:search) { described_class.new(current_user: user, current_account: account, params: params, search_type: search_type) }
+
+  let(:search_type) { 'all' }
+  let!(:account) { create(:account) }
+  let!(:user) { create(:user, account: account) }
+  let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
+  let(:harry) { create(:contact, name: 'Harry Potter', account_id: account.id) }
+
+  before do
+    create(:inbox_member, user: user, inbox: inbox)
+    create(:conversation, contact: harry, inbox: inbox, account: account)
+    create(:message, account: account, inbox: inbox, content: 'Harry Potter is a wizard')
+    Current.account = account
+  end
+
+  after do
+    Current.account = nil
+  end
+
+  describe '#perform' do
+    context 'when search types' do
+      let(:params) { { q: 'Potter' } }
+
+      it 'returns all for all' do
+        search_type = 'all'
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+        expect(search.perform.keys).to match_array(%i[contacts messages conversations])
+      end
+
+      it 'returns contacts for contacts' do
+        search_type = 'Contact'
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+        expect(search.perform.keys).to match_array(%i[contacts])
+      end
+
+      it 'returns messages for messages' do
+        search_type = 'Message'
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+        expect(search.perform.keys).to match_array(%i[messages])
+      end
+
+      it 'returns conversations for conversations' do
+        search_type = 'Conversation'
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+        expect(search.perform.keys).to match_array(%i[conversations])
+      end
+    end
+
+    context 'when contact search' do
+      it 'searches across name, email, phone_number and identifier' do
+        # random contact
+        create(:contact, account_id: account.id)
+        harry2 = create(:contact, email: 'HarryPotter@test.com', account_id: account.id)
+        harry3 = create(:contact, identifier: 'Potter123', account_id: account.id)
+
+        params = { q: 'Potter' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Contact')
+        expect(search.perform[:contacts].map(&:id)).to match_array([harry.id, harry2.id, harry3.id])
+      end
+    end
+
+    context 'when message search' do
+      it 'searches across message content' do
+        # random messages in another inbox
+        create(:message, account: account, inbox: create(:inbox, account: account), content: 'Harry Potter is a wizard')
+        create(:message, content: 'Harry Potter is a wizard')
+        message2 = create(:message, account: account, inbox: inbox, content: 'harry is cool')
+        params = { q: 'Harry' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
+        expect(search.perform[:messages].map(&:id)).to match_array([Message.first.id, message2.id])
+      end
+    end
+
+    context 'when conversation search' do
+      it 'searches across conversations using contact information' do
+        # random messages in another inbox
+        random = create(:contact, account_id: account.id)
+        create(:conversation, contact: random, inbox: inbox, account: account)
+        params = { q: 'Harry' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Conversation')
+        expect(search.perform[:conversations].map(&:id)).to match_array([Conversation.first.id])
+      end
+
+      it 'searches across conversations with display id' do
+        random = create(:contact, account_id: account.id, name: 'random', email: 'random@random.test', identifier: 'random')
+        new_converstion = create(:conversation, contact: random, inbox: inbox, account: account)
+        params = { q: new_converstion.display_id }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Conversation')
+        expect(search.perform[:conversations].map(&:id)).to match_array([new_converstion.id])
+      end
+    end
+  end
+end

From 0a993978bac241aca11f0c0300187ad54b12d335 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 1 Mar 2023 10:53:40 +0530
Subject: [PATCH 41/94] bug: Bulk actions Assign agent is not working (#6568)

---
 .../conversationBulkActions/AgentSelector.vue          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index ca7c0fbfb..578b6e821 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-on-clickaway="onClose" class="bulk-action__agents">
+  <div v-on-clickaway="onCloseAgentList" class="bulk-action__agents">
     <div class="triangle" :style="cssVars">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path
@@ -126,6 +126,7 @@ export default {
     return {
       query: '',
       selectedAgent: null,
+      goBackToAgentList: false,
     };
   },
   computed: {
@@ -169,6 +170,7 @@ export default {
       this.$emit('select', this.selectedAgent);
     },
     goBack() {
+      this.goBackToAgentList = true;
       this.selectedAgent = null;
     },
     assignAgent(agent) {
@@ -177,6 +179,12 @@ export default {
     onClose() {
       this.$emit('close');
     },
+    onCloseAgentList() {
+      if (this.selectedAgent === null && !this.goBackToAgentList) {
+        this.onClose();
+      }
+      this.goBackToAgentList = false;
+    },
   },
 };
 </script>

From e5090fcdc76da392e81cd6ef101b0bb2ac896f60 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 28 Feb 2023 21:32:54 -0800
Subject: [PATCH 42/94] fix: Show only categories where published articles
 count > 0 (#6567)

---
 app/views/public/api/v1/portals/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index c46a286d9..b56f20471 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -1,7 +1,7 @@
 <%= render "public/api/v1/portals/hero", portal: @portal %>
 <div class="max-w-5xl w-full flex-grow mx-auto py-8 px-4">
   <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-32 gap-y-0 lg:gap-y-12">
-    <% @portal.categories.where(locale: @locale).each do |category| %>
+    <% @portal.categories.where(locale: @locale).joins(:articles).where(articles:{ status: :published }).group('categories.id').each do |category| %>
       <%= render "public/api/v1/portals/category-block", category: category, portal: @portal %>
     <% end %>
   </div>

From 4c921d3d0ee6690a33599758efdb7c735f91a6e6 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 1 Mar 2023 11:44:16 +0530
Subject: [PATCH 43/94] chore: fix flaky tests (#6569)

- fixing flaky test in search service spec
---
 spec/services/search_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 1419eeac6..9bea59568 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -89,7 +89,7 @@ describe ::SearchService do
         new_converstion = create(:conversation, contact: random, inbox: inbox, account: account)
         params = { q: new_converstion.display_id }
         search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Conversation')
-        expect(search.perform[:conversations].map(&:id)).to match_array([new_converstion.id])
+        expect(search.perform[:conversations].map(&:id)).to include new_converstion.id
       end
     end
   end

From c9c3ac4b44b53bf9b627944b472bc4d6313144e5 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 1 Mar 2023 14:31:51 +0530
Subject: [PATCH 44/94] chore: Load only required APMs (#6497)

- Disable requiring the gems for all the APMs
- Switch to selectively requiring them.
---
 Gemfile                                     | 16 +++++++++-------
 Gemfile.lock                                |  6 +++---
 config/application.rb                       | 14 ++++++++++++++
 config/scout_apm.yml                        | 10 ++++++++++
 spec/lib/chatwoot_exception_tracker_spec.rb |  2 ++
 5 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 config/scout_apm.yml

diff --git a/Gemfile b/Gemfile
index 011acf584..7aca0710d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,13 +96,15 @@ gem 'slack-ruby-client'
 gem 'google-cloud-dialogflow'
 
 ##-- apm and error monitoring ---#
-gem 'ddtrace'
-gem 'elastic-apm'
-gem 'newrelic_rpm'
-gem 'scout_apm'
-gem 'sentry-rails', '~> 5.3', '>= 5.3.1'
-gem 'sentry-ruby', '~> 5.3'
-gem 'sentry-sidekiq', '~> 5.3', '>= 5.3.1'
+# loaded only when environment variables are set.
+# ref application.rb
+gem 'ddtrace', require: false
+gem 'elastic-apm', require: false
+gem 'newrelic_rpm', require: false
+gem 'scout_apm', require: false
+gem 'sentry-rails', require: false
+gem 'sentry-ruby', require: false
+gem 'sentry-sidekiq', require: false
 
 ##-- background job processing --##
 gem 'sidekiq', '~> 6.4.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 112e09e7f..e64b6b7b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -844,9 +844,9 @@ DEPENDENCIES
   rubocop-rspec
   scout_apm
   seed_dump
-  sentry-rails (~> 5.3, >= 5.3.1)
-  sentry-ruby (~> 5.3)
-  sentry-sidekiq (~> 5.3, >= 5.3.1)
+  sentry-rails
+  sentry-ruby
+  sentry-sidekiq
   shoulda-matchers
   sidekiq (~> 6.4.2)
   sidekiq-cron (~> 1.6, >= 1.6.0)
diff --git a/config/application.rb b/config/application.rb
index dc4d42ca9..428747b2a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -8,6 +8,20 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+## Load the specific APM agent
+# We rely on DOTENV to load the environment variables
+# We need these environment variables to load the specific APM agent
+Dotenv::Railtie.load
+require 'ddtrace' if ENV.fetch('DD_TRACE_AGENT_URL', false).present?
+require 'elastic-apm' if ENV.fetch('ELASTIC_APM_SECRET_TOKEN', false).present?
+require 'newrelic_rpm' if ENV.fetch('NEW_RELIC_LICENSE_KEY', false).present?
+require 'scout_apm' if ENV.fetch('SCOUT_KEY', false).present?
+if ENV.fetch('SENTRY_DSN', false).present?
+  require 'sentry-ruby'
+  require 'sentry-rails'
+  require 'sentry-sidekiq'
+end
+
 module Chatwoot
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
diff --git a/config/scout_apm.yml b/config/scout_apm.yml
new file mode 100644
index 000000000..49657597a
--- /dev/null
+++ b/config/scout_apm.yml
@@ -0,0 +1,10 @@
+common: &defaults
+  name: <%= ENV.fetch('SCOUT_NAME', '') %>
+  key: <%= ENV.fetch('SCOUT_KEY', '') %>
+  monitor: <%= ENV['SCOUT_KEY'].present? && ENV.fetch('SCOUT_MONITOR', true)  %>
+
+test:
+  monitor: <%= ENV['SCOUT_KEY'].present? && ENV.fetch('SCOUT_MONITOR', true)  %>
+
+production:
+  <<: *defaults
diff --git a/spec/lib/chatwoot_exception_tracker_spec.rb b/spec/lib/chatwoot_exception_tracker_spec.rb
index d0d1b37a3..317c69b34 100644
--- a/spec/lib/chatwoot_exception_tracker_spec.rb
+++ b/spec/lib/chatwoot_exception_tracker_spec.rb
@@ -1,4 +1,6 @@
 require 'rails_helper'
+# explicitly requiring since we are loading apms conditionally in application.rb
+require 'sentry-ruby'
 
 describe ChatwootExceptionTracker do
   it 'use rails logger if no tracker is configured' do

From 40e81c63ade8f81782282b7ab09a18e8cf29174f Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Wed, 1 Mar 2023 01:05:04 -0800
Subject: [PATCH 45/94] chore: New Crowdin updates (#6566)

- Pulling the latest translation updates from Crowdin.

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/da/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/el/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/he/agentBots.json   |  70 ++++-----
 .../i18n/locale/he/attributesMgmt.json        |  32 ++---
 .../dashboard/i18n/locale/he/automation.json  |  90 ++++++------
 .../dashboard/i18n/locale/he/bulkActions.json |  14 +-
 .../dashboard/i18n/locale/he/cannedMgmt.json  |  28 ++--
 .../dashboard/i18n/locale/he/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/he/inboxMgmt.json   |  85 +++++------
 .../dashboard/i18n/locale/he/settings.json    | 136 +++++++++---------
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/id/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/is/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ka/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/lt/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ms/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/no/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |   3 +-
 .../i18n/locale/pt/conversation.json          |  20 +--
 .../i18n/locale/pt/generalSettings.json       |  24 ++--
 .../dashboard/i18n/locale/pt/helpCenter.json  |  16 +--
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  87 +++++------
 .../i18n/locale/pt/integrations.json          |  36 ++---
 .../dashboard/i18n/locale/pt/settings.json    |  36 ++---
 .../dashboard/i18n/locale/pt/signup.json      |   2 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |   3 +-
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/th/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |   3 +-
 .../dashboard/i18n/locale/ur/inboxMgmt.json   |   3 +-
 .../i18n/locale/ur_IN/inboxMgmt.json          |   3 +-
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |   3 +-
 .../i18n/locale/zh_CN/inboxMgmt.json          |   3 +-
 .../i18n/locale/zh_TW/inboxMgmt.json          |   3 +-
 app/javascript/widget/i18n/locale/ar.json     |   3 +-
 app/javascript/widget/i18n/locale/bg.json     |   3 +-
 app/javascript/widget/i18n/locale/ca.json     |   3 +-
 app/javascript/widget/i18n/locale/cs.json     |   3 +-
 app/javascript/widget/i18n/locale/da.json     |   3 +-
 app/javascript/widget/i18n/locale/de.json     |   3 +-
 app/javascript/widget/i18n/locale/el.json     |   3 +-
 app/javascript/widget/i18n/locale/es.json     |   3 +-
 app/javascript/widget/i18n/locale/fa.json     |   3 +-
 app/javascript/widget/i18n/locale/fi.json     |   3 +-
 app/javascript/widget/i18n/locale/fr.json     |   3 +-
 app/javascript/widget/i18n/locale/he.json     |   3 +-
 app/javascript/widget/i18n/locale/hi.json     |   3 +-
 app/javascript/widget/i18n/locale/hu.json     |   3 +-
 app/javascript/widget/i18n/locale/id.json     |   3 +-
 app/javascript/widget/i18n/locale/is.json     |   3 +-
 app/javascript/widget/i18n/locale/it.json     |   3 +-
 app/javascript/widget/i18n/locale/ja.json     |   3 +-
 app/javascript/widget/i18n/locale/ka.json     |   3 +-
 app/javascript/widget/i18n/locale/ko.json     |   3 +-
 app/javascript/widget/i18n/locale/lt.json     |   3 +-
 app/javascript/widget/i18n/locale/lv.json     |   3 +-
 app/javascript/widget/i18n/locale/ml.json     |   3 +-
 app/javascript/widget/i18n/locale/ms.json     |   3 +-
 app/javascript/widget/i18n/locale/ne.json     |   3 +-
 app/javascript/widget/i18n/locale/nl.json     |   3 +-
 app/javascript/widget/i18n/locale/no.json     |   3 +-
 app/javascript/widget/i18n/locale/pl.json     |   3 +-
 app/javascript/widget/i18n/locale/pt.json     |   5 +-
 app/javascript/widget/i18n/locale/pt_BR.json  |   3 +-
 app/javascript/widget/i18n/locale/ro.json     |   3 +-
 app/javascript/widget/i18n/locale/ru.json     |   3 +-
 app/javascript/widget/i18n/locale/sk.json     |   3 +-
 app/javascript/widget/i18n/locale/sr.json     |   3 +-
 app/javascript/widget/i18n/locale/sv.json     |   3 +-
 app/javascript/widget/i18n/locale/ta.json     |   3 +-
 app/javascript/widget/i18n/locale/th.json     |   3 +-
 app/javascript/widget/i18n/locale/tr.json     |   3 +-
 app/javascript/widget/i18n/locale/uk.json     |   3 +-
 app/javascript/widget/i18n/locale/ur.json     |   3 +-
 app/javascript/widget/i18n/locale/ur_IN.json  |   3 +-
 app/javascript/widget/i18n/locale/vi.json     |   3 +-
 app/javascript/widget/i18n/locale/zh_CN.json  |   3 +-
 app/javascript/widget/i18n/locale/zh_TW.json  |   3 +-
 config/locales/fa.yml                         |  12 +-
 config/locales/lv.yml                         |  12 +-
 config/locales/pt.yml                         |  14 +-
 config/locales/pt_BR.yml                      |  12 +-
 config/locales/ru.yml                         |  12 +-
 106 files changed, 544 insertions(+), 456 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 300bd1ab3..73c75cd21 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "مفتاح API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "تحديث"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "تحديث",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "حد الإسناد التلقائي",
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index ef15a0d34..97cedca41 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновяване"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновяване",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index dbeb43e8d..5a4f3acc1 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualitza"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualitza",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 27bec1a3b..83818cad5 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizovat"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizovat",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 31b481a35..28dfb7f61 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Nøgle",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Opdater"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Opdater",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Grænse for automatisk tildeling",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index dce03828e..3b3023c20 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API-Schlüssel",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualisieren"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualisieren",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limit für automatische Zuweisung",
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index cddf4985c..2989314b6 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Κλειδί API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Ενημέρωση"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Ενημέρωση",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Αυτόματο όριο ανάθεσης",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 8c511395a..d3f70563c 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Clave de API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizar"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizar",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Límite de asignación automática",
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 54420ce7a..47b5211a7 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "کلید API را به روز کنید",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "کلید API جدید را در اینجا وارد کنید",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "اعمال شود"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "اعمال شود",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "به‌روزرسانی تنظیمات فرم قبل از گفتگو"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "محدودیت تخصیص خودکار",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 85ce3bf7a..d9b340d68 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Päivitä"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Päivitä",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index ddac315a3..57d92173c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Clé de l'API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Mettre à jour"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Mettre à jour",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/he/agentBots.json b/app/javascript/dashboard/i18n/locale/he/agentBots.json
index 7299a839e..194c830c3 100644
--- a/app/javascript/dashboard/i18n/locale/he/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/he/agentBots.json
@@ -1,73 +1,73 @@
 {
   "AGENT_BOTS": {
     "HEADER": "בוטים",
-    "LOADING_EDITOR": "Loading Editor...",
-    "HEADER_BTN_TXT": "Add Bot Configuration",
-    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent bots allows you to automate the conversations</p>",
+    "LOADING_EDITOR": "טוען את העורך...",
+    "HEADER_BTN_TXT": "הוסף הגדרת בוט",
+    "SIDEBAR_TXT": "<p><b>סוכן בוט</b> <p>סוכני בוט מאפשרים לך לבצע אוטומציה של השיחה</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot Name",
-        "PLACEHOLDER": "Give your bot a name",
-        "ERROR": "Bot name is required"
+        "LABEL": "שם הבוט",
+        "PLACEHOLDER": "תן שם לבוט שלך",
+        "ERROR": "חובה לתת שם לבוט"
       },
       "DESCRIPTION": {
-        "LABEL": "Bot Description",
-        "PLACEHOLDER": "What does this bot do?"
+        "LABEL": "תיאור הבוט",
+        "PLACEHOLDER": "מה הבוט הזה עושה?"
       },
       "BOT_CONFIG": {
-        "ERROR": "Please enter your CSML bot configuration above",
-        "API_ERROR": "Your CSML configuration is invalid, please fix it and try again."
+        "ERROR": "נא הכנס את הגדרות ה-CSML עבור הבוט שלך",
+        "API_ERROR": "הגדרות ה-CSML אינם תקינים, נא לתקן ולנסות שוב."
       },
-      "SUBMIT": "Validate and save"
+      "SUBMIT": "אמת ושמור"
     },
     "BOT_CONFIGURATION": {
-      "TITLE": "Select an agent bot",
-      "DESC": "You can set an agent bot from the list to this inbox. The bot can initially handle the conversation and transfer it to an agent when needed.",
+      "TITLE": "בחר סוכן בוט",
+      "DESC": "תוכל להגדיר את סוכן הבוט מתוך הרשימה עבור תיבת דואר זו. הבוט יכול לנהל את השיחה ולהעביר אותה לנציג אנושי כשיידרש.",
       "SUBMIT": "עדכן",
-      "DISCONNECT": "Disconnect Bot",
-      "SUCCESS_MESSAGE": "Successfully updated the agent bot",
-      "DISCONNECTED_SUCCESS_MESSAGE": "Successfully disconnected the agent bot",
-      "ERROR_MESSAGE": "Could not update the agent bot, please try again later",
-      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot, please try again later",
-      "SELECT_PLACEHOLDER": "Select Bot"
+      "DISCONNECT": "נתק בוט",
+      "SUCCESS_MESSAGE": "סוכן הבוט עודכן בהצלחה",
+      "DISCONNECTED_SUCCESS_MESSAGE": "סוכן הבוט נותק בהצלחה",
+      "ERROR_MESSAGE": "עדכון סוכן הבוט נכשל, אנא נסה מאוחר יותר",
+      "DISCONNECTED_ERROR_MESSAGE": "ניתוק סוכן הבוט נכשל, אנא נסה מאוחר יותר",
+      "SELECT_PLACEHOLDER": "בחר בוט"
     },
     "ADD": {
-      "TITLE": "Configure new bot",
+      "TITLE": "הגדר בוט חדש",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "API": {
-        "SUCCESS_MESSAGE": "Bot added successfully",
-        "ERROR_MESSAGE": "Could not add bot, Please try again later"
+        "SUCCESS_MESSAGE": "הבוט התווסף בהצלחה",
+        "ERROR_MESSAGE": "הוספת הבוט נכשלה, אנא נסה מאוחר יותר"
       }
     },
     "LIST": {
-      "404": "No Bots found, you can create a bot by clicking the 'Configure new bot' Button ↗",
-      "LOADING": "Fetching Bots...",
-      "TYPE": "Bot Type"
+      "404": "לא נמצאו בוטים, תוכל ליצור אחד בתפריט \"הגדר בוט חדש\" ↗",
+      "LOADING": "מבצע משיכת בוטים...",
+      "TYPE": "סוג הבוט"
     },
     "DELETE": {
       "BUTTON_TEXT": "מחק",
-      "TITLE": "Delete Bot",
+      "TITLE": "מחק בוט",
       "SUBMIT": "מחק",
       "CANCEL_BUTTON_TEXT": "ביטול",
-      "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
+      "DESCRIPTION": "האם אתה בטוח שברצונך למחוק בוט זה? פעולה זו לא ניתנת לשחזור",
       "API": {
-        "SUCCESS_MESSAGE": "Bot deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete bot, Please try again later"
+        "SUCCESS_MESSAGE": "הבוט נמחק בהצלחה",
+        "ERROR_MESSAGE": "מחיקת הבוט נכשלה, אנא נסה מאוחר יותר"
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "ערוך",
-      "LOADING": "Fetching Bots...",
-      "TITLE": "Edit Bot",
+      "LOADING": "מבצע משיכת בוטים...",
+      "TITLE": "ערוך בוט",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "API": {
-        "SUCCESS_MESSAGE": "Bot updated successfully",
-        "ERROR_MESSAGE": "Could not update bot, Please try again later"
+        "SUCCESS_MESSAGE": "הבוט עודכן בהצלחה",
+        "ERROR_MESSAGE": "עדכון הבוט נכשל, אנא נסה מאוחר יותר"
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook Bot",
-      "CSML": "CSML Bot"
+      "WEBHOOK": "Webhook בוט",
+      "CSML": "CSML בוט"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
index 378001afb..9ce953b8b 100644
--- a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "מאפיינים בהתאמה אישית",
     "HEADER_BTN_TXT": "הוסף מאפיין מותאם אישית",
     "LOADING": "שולף מאפיינים מותאמים אישית",
-    "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>",
+    "SIDEBAR_TXT": "<p><b>שדות מותאמים</b> <p> שדות מותאמים הינן פרמטרים נוספים שאתה יכול לשמור אודות איש הקשר או השיחה שלך — לדוגמא החבילה שבה נמצא הלקוח, או מתי הם עשו רכישה לאחרונה. <br /><br /> כדי ליצור שדה מותאם חדש, יש ללחוץ על <b>הוסף שדה. </b> ניתן גם לערוך או לחוק שדות על ידי לחיצה על כפתור העריכה או המחיקה בהתאמה </p>",
     "ADD": {
       "TITLE": "הוסף מאפיין מותאם אישית",
       "SUBMIT": "צור",
@@ -11,12 +11,12 @@
       "FORM": {
         "NAME": {
           "LABEL": "שם תצוגה",
-          "PLACEHOLDER": "Enter custom attribute display name",
+          "PLACEHOLDER": "הכנס שם לשדה המותאם",
           "ERROR": "שם שדה חובה"
         },
         "DESC": {
           "LABEL": "תיאור",
-          "PLACEHOLDER": "Enter custom attribute description",
+          "PLACEHOLDER": "הכנס תיאור לשדה המותאם",
           "ERROR": "נדרש תיאור"
         },
         "MODEL": {
@@ -29,49 +29,49 @@
           "PLACEHOLDER": "אנא בחר סוג",
           "ERROR": "סוג הינו שדה חובה",
           "LIST": {
-            "LABEL": "List Values",
-            "PLACEHOLDER": "Please enter value and press enter key",
+            "LABEL": "רשימת ערכים",
+            "PLACEHOLDER": "נא הכנס ערך תקין ולחץ על Enter",
             "ERROR": "חובה להזין לפחות ערך אחד"
           }
         },
         "KEY": {
           "LABEL": "מפתח",
-          "PLACEHOLDER": "Enter custom attribute key",
+          "PLACEHOLDER": "הכנס מפתח ייחודי לשדה המותאם",
           "ERROR": "מפתח הוא שדה חובה",
           "IN_VALID": "מפתח אינו חוקי"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute added successfully!",
-        "ERROR_MESSAGE": "Could not create a Custom Attribute. Please try again later."
+        "SUCCESS_MESSAGE": "שדה מותאם התווסף בהצלחה!",
+        "ERROR_MESSAGE": "לא ניתן היה ליצור שדה מותאם, אנא נסה שוב מאוחר יותר."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "מחק",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
+        "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": "רשימת ערכים",
-          "PLACEHOLDER": "Please enter values and press enter key"
+          "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/he/automation.json b/app/javascript/dashboard/i18n/locale/he/automation.json
index 3c5ebdfc7..036255990 100644
--- a/app/javascript/dashboard/i18n/locale/he/automation.json
+++ b/app/javascript/dashboard/i18n/locale/he/automation.json
@@ -1,41 +1,41 @@
 {
   "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>",
+    "HEADER": "אוטומציות",
+    "HEADER_BTN_TXT": "הוספת אוטומציה",
+    "LOADING": "חיבור אוטומציות",
+    "SIDEBAR_TXT": "<p><b>אוטומציות</b> <p>האוטומציות יכולות להחליף פעולות שאתם עושים בדרך כלל בצורה ידנית. ניתן לעשות שלל דברים עם אוטומציה לדוגמא הוספת תויית ושיוך שיחה לסוכן בהתאם לחוקים מוגדרים מראש. זה יאפשר לצוות שלכם להתמקד בדברים החשובים באמת ולתת למערכת לעשות פעולות אוטומיות.</p>",
     "ADD": {
-      "TITLE": "Add Automation Rule",
+      "TITLE": "הוספת אוטומציה",
       "SUBMIT": "צור",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
+          "LABEL": "שם",
+          "PLACEHOLDER": "הכנס שם לאוטומציה",
           "ERROR": "שם שדה חובה"
         },
         "DESC": {
           "LABEL": "תיאור",
-          "PLACEHOLDER": "Enter rule description",
+          "PLACEHOLDER": "הכנס תיאור",
           "ERROR": "נדרש תיאור"
         },
         "EVENT": {
-          "LABEL": "Event",
+          "LABEL": "אירוע",
           "PLACEHOLDER": "בבקשה תבחר אחד",
-          "ERROR": "Event is required"
+          "ERROR": "אירוע נדרש"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "תנאים"
         },
         "ACTIONS": {
           "LABEL": "פעולות"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "הוסף תנאי",
+      "ACTION_BUTTON_LABEL": "הוסף פעולה",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
-        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "אוטומציה התווספה בהצלחה",
+        "ERROR_MESSAGE": "הוספת אוטומציה נכשלה, נסה שנית מאוחר יותר"
       }
     },
     "LIST": {
@@ -43,12 +43,12 @@
         "שם",
         "תיאור",
         "פעיל",
-        "Created on"
+        "נוצר ב"
       ],
-      "404": "No automation rules found"
+      "404": "לא נמצאו אוטומציות"
     },
     "DELETE": {
-      "TITLE": "Delete Automation Rule",
+      "TITLE": "מחק אוטומציה",
       "SUBMIT": "מחק",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "CONFIRM": {
@@ -58,24 +58,24 @@
         "NO": "לא, השאר "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "אוטומציה נמחקה בהצלחה",
+        "ERROR_MESSAGE": "מחיקת האוטומציה נכשלה, נסה שנית מאוחר יותר"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Automation Rule",
+      "TITLE": "ערוך אוטומציה",
       "SUBMIT": "עדכן",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule updated successfully",
-        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "אוטומציה התעדכנה בהצלחה",
+        "ERROR_MESSAGE": "עדכון אוטומציה נכשל, נסה שנית מאוחר יותר"
       }
     },
     "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": {
@@ -83,36 +83,36 @@
       "CREATE": "צור",
       "DELETE": "מחק",
       "CANCEL": "ביטול",
-      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+      "RESET_MESSAGE": "שינוי סוג אירוע יאפס את התנאים והפעולות שהוגדרו"
     },
     "CONDITION": {
-      "DELETE_MESSAGE": "You need to have atleast one condition to save",
-      "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes",
-      "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes"
+      "DELETE_MESSAGE": "נדרש לפחות תנאי אחד",
+      "CONTACT_CUSTOM_ATTR_LABEL": "שדה מותאם של איש קשר",
+      "CONVERSATION_CUSTOM_ATTR_LABEL": "שדה מותאם של שיחה"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save",
-      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
-      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
+      "DELETE_MESSAGE": "נדרשת פעולה אחת לפחות",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "הכנס כאן את ההודעה",
+      "TEAM_DROPDOWN_PLACEHOLDER": "בחר קבוצות"
     },
     "TOGGLE": {
-      "ACTIVATION_TITLE": "Activate Automation Rule",
-      "DEACTIVATION_TITLE": "Deactivate Automation Rule",
-      "ACTIVATION_DESCRIPTION": "This action will activate the automation rule '{automationName}'. Are you sure you want to proceed?",
-      "DEACTIVATION_DESCRIPTION": "This action will deactivate the automation rule '{automationName}'. Are you sure you want to proceed?",
-      "ACTIVATION_SUCCESFUL": "Automation Rule Activated Successfully",
-      "DEACTIVATION_SUCCESFUL": "Automation Rule Deactivated Successfully",
-      "ACTIVATION_ERROR": "Could not Activate Automation, Please try again later",
-      "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
+      "ACTIVATION_TITLE": "הפעל אוטומציה",
+      "DEACTIVATION_TITLE": "השהה אוטומציה",
+      "ACTIVATION_DESCRIPTION": "פעולה זו תפעיל את האוטומציה '{automationName}'. האם אתה בטוח שברצונך להמשיך?",
+      "DEACTIVATION_DESCRIPTION": "פעולה זו תשהה את האוטומציה '{automationName}'. האם אתה בטוח שברצונך להמשיך?",
+      "ACTIVATION_SUCCESFUL": "אוטומציה הופעלה בהצלחה",
+      "DEACTIVATION_SUCCESFUL": "אוטומציה הושהתה בהצלחה",
+      "ACTIVATION_ERROR": "הפעלת אוטומציה נכשלה, נסה שנית מאוחר יותר",
+      "DEACTIVATION_ERROR": "השהיית אוטומציה נכשלה, נסה שנית מאוחר יותר",
       "CONFIRMATION_LABEL": "כן",
       "CANCEL_LABEL": "לא"
     },
     "ATTACHMENT": {
-      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
-      "LABEL_IDLE": "Upload Attachment",
+      "UPLOAD_ERROR": "העלאת קובץ נכשלה, נסה שנית",
+      "LABEL_IDLE": "העלה קובץ",
       "LABEL_UPLOADING": "מעלה...",
-      "LABEL_UPLOADED": "Successfully Uploaded",
-      "LABEL_UPLOAD_FAILED": "Upload Failed"
+      "LABEL_UPLOADED": "קובץ הועלה בהצלחה",
+      "LABEL_UPLOAD_FAILED": "העלאה נכשלה"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/bulkActions.json b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
index 60ed657c0..40d031419 100644
--- a/app/javascript/dashboard/i18n/locale/he/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
@@ -2,8 +2,8 @@
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} שיחות נבחרו",
     "AGENT_SELECT_LABEL": "בחר סוכן",
-    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
-    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
+    "ASSIGN_CONFIRMATION_LABEL": "האם אתה בטוח שברצונך לשייך %{conversationCount} %{conversationLabel} ל-",
+    "UNASSIGN_CONFIRMATION_LABEL": "האם אתה בטוח שברצונך לבטל שיוך %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "חזור",
     "ASSIGN_LABEL": "שייך",
     "YES": "כן",
@@ -29,12 +29,12 @@
       "ASSIGN_FAILED": "שיוך תוויות נכשל, נסה שנית"
     },
     "TEAMS": {
-      "TEAM_SELECT_LABEL": "Select Team",
+      "TEAM_SELECT_LABEL": "בחר קבוצה",
       "NONE": "כלום",
-      "NO_TEAMS_AVAILABLE": "There are no teams added to this account yet.",
-      "ASSIGN_SELECTED_TEAMS": "Assign selected team",
-      "ASSIGN_SUCCESFUL": "Teams assiged successfully",
-      "ASSIGN_FAILED": "Failed to assign team, please try again"
+      "NO_TEAMS_AVAILABLE": "לא קיימות קבוצות להוספה.",
+      "ASSIGN_SELECTED_TEAMS": "שייך קבוצה",
+      "ASSIGN_SUCCESFUL": "שיוך קבוצה בוצע בהצלחה",
+      "ASSIGN_FAILED": "שיוך קבוצה נכשל, נסה שנית"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
index ede367a0e..7a5f8a43b 100644
--- a/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/cannedMgmt.json
@@ -4,31 +4,31 @@
     "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>תגובות מוכנות</b> </p><p> תגובות מוכנות הן תבניות לתגובה מהירה להודעות בצ'אטים שלך. </p><p> כדי להוסיף תגובה מוכנה, יש ללחוץ על <b> הוספת תגובה מוכנה </b> ניתן גם למחוק או לערוך תגובות קיימות </p><p> תגובות מוכנות עושות שימוש <b>בקוד מקוצר</b>. ניתן להציג את רשימת הקיצורים במהלך שיחה על ידי הקשת המקש <b>'/'</b> והקוד המקוצר לאחר מכן. </p>",
     "LIST": {
       "404": "אין תגובות מוכנות זמינות בחשבון זה.",
       "TITLE": "נהל תגובות מוכנות",
-      "DESC": "תגובות מוכנות הן תבניות תשובה מוגדרות מראש שבהן ניתן להשתמש כדי לשלוח במהירות תשובות לכרטיסים.",
+      "DESC": "תגובות מוכנות הן תבניות תשובה מוגדרות מראש שבהן ניתן להשתמש כדי לשלוח במהירות תשובות לשיחות.",
       "TABLE_HEADER": [
-        "קוד קצר",
+        "קוד מקוצר",
         "תוכן",
         "פעולות"
       ]
     },
     "ADD": {
       "TITLE": "הוסף תגובה מוכנה",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "התגובות המוכנות הם תבניות תשובה מהירה מוגדרות מראש שניתן להשתמש בהם על מנת לענות במהירות לשיחות.",
       "CANCEL_BUTTON_TEXT": "ביטול",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "קוד קצר",
-          "PLACEHOLDER": "נא להזין קוד קצר",
-          "ERROR": "קוד קצר נדרש"
+          "LABEL": "קוד מקוצר",
+          "PLACEHOLDER": "נא להזין קוד מקוצר",
+          "ERROR": "קוד מקוצר נדרש"
         },
         "CONTENT": {
           "LABEL": "תוכן",
           "PLACEHOLDER": "נא להזין תוכן",
-          "ERROR": "נא להזין תוכן"
+          "ERROR": "חובה להזין תוכן"
         },
         "SUBMIT": "שלח"
       },
@@ -42,27 +42,27 @@
       "CANCEL_BUTTON_TEXT": "ביטול",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "קוד קצר",
-          "PLACEHOLDER": "נא להזין קוד קצר",
-          "ERROR": "קוד קצר נדרש"
+          "LABEL": "קוד מקוצר",
+          "PLACEHOLDER": "נא להזין קוד מקוצר",
+          "ERROR": "קוד מקוצר נדרש"
         },
         "CONTENT": {
           "LABEL": "תוכן",
           "PLACEHOLDER": "נא להזין תוכן",
-          "ERROR": "נא להזין תוכן"
+          "ERROR": "חובה להזין תוכן"
         },
         "SUBMIT": "שלח"
       },
       "BUTTON_TEXT": "ערוך",
       "API": {
-        "SUCCESS_MESSAGE": "התגובה המוכנה עודכנה בהצלחה",
+        "SUCCESS_MESSAGE": "תגובה מוכנה עודכנה בהצלחה",
         "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "מחק",
       "API": {
-        "SUCCESS_MESSAGE": "התגובה המוכנה נמחקה בהצלחה",
+        "SUCCESS_MESSAGE": "תגובה מוכנה נמחקה בהצלחה",
         "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
       },
       "CONFIRM": {
diff --git a/app/javascript/dashboard/i18n/locale/he/helpCenter.json b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
index 20ae02725..510a9ff2d 100644
--- a/app/javascript/dashboard/i18n/locale/he/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
@@ -30,7 +30,7 @@
     },
     "ARTICLE_EDITOR": {
       "IMAGE_UPLOAD": {
-        "TITLE": "Upload image",
+        "TITLE": "העלה תמונה",
         "UPLOADING": "מעלה...",
         "SUCCESS": "Image uploaded successfully",
         "ERROR": "Error while uploading image",
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 140ab88d8..40dca7021 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -31,7 +31,7 @@
       "CHANNEL_NAME": {
         "LABEL": "שם תיבת הדואר הנכנס",
         "PLACEHOLDER": "הזן את שם תיבת הדואר הנכנס שלך (למשל: Acme Inc)",
-        "ERROR": "Please enter a valid inbox name"
+        "ERROR": "נא הכנס שם תקני לתיבת הדואר"
       },
       "WEBSITE_NAME": {
         "LABEL": "שם האתר",
@@ -50,7 +50,7 @@
         "HELP": "כדי להוסיף את פרופיל הטוויטר שלך כערוץ, עליך לאמת את פרופיל הטוויטר שלך על ידי לחיצה על 'היכנס באמצעות טוויטר' ",
         "ERROR_MESSAGE": "אירעה שגיאה בחיבור לטוויטר, אנא נסה שוב",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "צור שיחות מהציוצים המוזכרים"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -83,7 +83,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "אפשר ברכה בערוץ",
-          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
+          "HELP_TEXT": "שלח הודעת פתיחה אוטומטית ביצירת שיחה חדשה.",
           "ENABLED": "מופעל",
           "DISABLED": "כבוי"
         },
@@ -100,7 +100,7 @@
         },
         "SUBMIT_BUTTON": "צור תיבת דואר נכנס",
         "API": {
-          "ERROR_MESSAGE": "We were not able to create a website channel, please try again"
+          "ERROR_MESSAGE": "יצירת ערוץ אתר אינטרנט נכשלה, אנא נסה שנית"
         }
       },
       "TWILIO": {
@@ -112,10 +112,10 @@
           "ERROR": "שדה חובה"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "LABEL": "ערוץ הודעות SID",
+          "PLACEHOLDER": "נא הכנס מזהה Twilio Messaging Service SID",
           "ERROR": "שדה חובה",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "USE_MESSAGING_SERVICE": "השתמש ב- Twilio Messaging Service"
         },
         "CHANNEL_TYPE": {
           "LABEL": "סוג ערוץ",
@@ -134,7 +134,7 @@
         "PHONE_NUMBER": {
           "LABEL": "מספר טלפון",
           "PLACEHOLDER": "נא להזין את מספר הטלפון שממנו תישלח ההודעה.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "נא ספק מספר טלפון תקני שמתחיל ב- '+' ולא מכיל רווחים."
         },
         "API_CALLBACK": {
           "TITLE": "כתובת אתר להתקשרות חוזרת",
@@ -146,35 +146,35 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "ערוץ SMS",
+        "DESC": "התחל לתמוך בלקוחותיך באמצעות SMS.",
         "PROVIDERS": {
           "LABEL": "ספק API",
           "TWILIO": "Twilio",
           "BANDWIDTH": "Bandwidth"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "שמירת ערוץ ה-SMS נכשלה"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
             "LABEL": "מזהה חשבון",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "PLACEHOLDER": "נא הכנס את מזהה ה- Bandwidth Account ID שלך",
             "ERROR": "שדה חובה"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "API key",
+            "PLACEHOLDER": "נא הכנס את ה- Bandwith API Key שלך",
             "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",
+            "PLACEHOLDER": "נא הכנס את מזהה ה-Bandwidth Application ID שלך",
             "ERROR": "שדה חובה"
           },
           "INBOX_NAME": {
@@ -185,15 +185,15 @@
           "PHONE_NUMBER": {
             "LABEL": "מספר טלפון",
             "PLACEHOLDER": "נא להזין את מספר הטלפון שממנו תישלח ההודעה.",
-            "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+            "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": "כתובת אתר להתקשרות חוזרת",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "SUBTITLE": "עליך להגדיר את ה- message callback URL ב- Bandwidth עם ה-URL שמוצג כאן."
           }
         }
       },
@@ -214,21 +214,21 @@
         "PHONE_NUMBER": {
           "LABEL": "מספר טלפון",
           "PLACEHOLDER": "נא להזין את מספר הטלפון שממנו תישלח ההודעה.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "נא ספק מספר טלפון תקני שמתחיל ב- '+' ולא מכיל רווחים."
         },
         "PHONE_NUMBER_ID": {
           "LABEL": "Phone number ID",
-          "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
+          "PLACEHOLDER": "נא הכנס את Phone number ID מתוך ממשק ה- Facebook developer.",
           "ERROR": "אנא הכנס ערך תקין."
         },
         "BUSINESS_ACCOUNT_ID": {
           "LABEL": "Business Account ID",
-          "PLACEHOLDER": "Please enter the Business Account ID obtained from Facebook developer dashboard.",
+          "PLACEHOLDER": "נא הכנס את Business Account ID מתוך ממשק ה- Facebook developer.",
           "ERROR": "אנא הכנס ערך תקין."
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "PLACEHOLDER": "נא הכנס verify token שברצונך להגדיר עבור facebook webhooks.",
           "ERROR": "אנא הכנס ערך תקין."
         },
         "API_KEY": {
@@ -239,7 +239,7 @@
         },
         "API_CALLBACK": {
           "TITLE": "כתובת אתר להתקשרות חוזרת",
-          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "SUBTITLE": "עליך להגדיר את ה- webhook URL ואת ה- verification token הבאים בממשק ה- Facebook Developer.",
           "WEBHOOK_URL": "Webhook URL",
           "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
@@ -329,7 +329,7 @@
       },
       "AUTH": {
         "TITLE": "בחר ערוץ",
-        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+        "DESC": "אנו תומכים בווידג'ט של צ'אט חי, עמוד פייסבוק, פרופיל טוויטר, WhatsApp, דוא\"ל וכו', כערוצי תקשורת. אם אתה רוצה לבנות ערוץ מותאם אישית, אתה יכול ליצור אותו באמצעות ערוץ ה-API. בחר ערוץ אחד מהאפשרויות מטה כדי להמשיך."
       },
       "AGENTS": {
         "TITLE": "סוכנים",
@@ -346,15 +346,15 @@
         "DESC": "סיימת בהצלחה לשלב את דף הפייסבוק שלך עם Chatwoot. בפעם הבאה שלקוח ישלח הודעה לדף שלך, השיחה תופיע אוטומטית בתיבת הדואר הנכנס שלך.<br>אנחנו גם מספקים לך סקריפט ווידג'ט שתוכל להוסיף בקלות לאתר שלך. ברגע שזה פעיל באתר שלך, לקוחות יכולים לשלוח לך הודעות ישירות מהאתר שלך ללא עזרה של כל כלי חיצוני והשיחה תופיע ממש כאן, ב-Chatwoot.<br>מגניב, הא? ובכן, אנחנו בטוח מנסים להיות :)"
       },
       "EMAIL_PROVIDER": {
-        "TITLE": "Select your email provider",
-        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+        "TITLE": "בחר את ספק הדוא\"ל שלך",
+        "DESCRIPTION": "בחר את ספק הדוא\"ל שלך מהרשימה מטה. אם אתה לא מוצא את ספק הדוא\"ל שלך ברשימה, תוכל לבחור את אפשרות \"ספק אחר\" ולספק את הגדרות ה- IMAP ו-SMTP."
       },
       "MICROSOFT": {
         "TITLE": "Microsoft Email",
-        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "EMAIL_PLACEHOLDER": "Enter email address",
-        "HELP": "To add your Microsoft account as a channel, you need to authenticate your Microsoft account by clicking on 'Sign in with Microsoft' ",
-        "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
+        "DESCRIPTION": "לחץ על Sign in with Microsoft בכדי להתחיל. אתה תופנה למסך ההתחברות של Microsoft. ברגע שתאשר את בקשת ההרשאות, תופנה חזרה להגדרות תיבת הדואר.",
+        "EMAIL_PLACEHOLDER": "הכנס כתובת דוא\"ל",
+        "HELP": "בכדי להוסיף חשבון Microsoft כערוץ, עליך להתחבר לחשבונך ע\"י לחיצה על 'Sign in with Microsoft' ",
+        "ERROR_MESSAGE": "אירעה שגיאה בהתחברות ל- Microsoft, אנא נסה שנית"
       }
     },
     "DETAILS": {
@@ -381,7 +381,7 @@
       "API": {
         "SUCCESS_MESSAGE": "הגדרות תיבת הדואר הנכנס עודכנו בהצלחה",
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "ההקצאה האוטומטית עודכנה בהצלחה",
-        "ERROR_MESSAGE": "We couldn't update inbox settings. Please try again later."
+        "ERROR_MESSAGE": "לא הצלחנו לעדכן את הגדרות תיבת הדואר שלך, אנא נסה שנית מאוחר יותר."
       },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "מופעל",
@@ -432,31 +432,31 @@
       "PRE_CHAT_FORM": "טופס צ'אט מקדים",
       "BUSINESS_HOURS": "שעות פעילות",
       "WIDGET_BUILDER": "Widget Builder",
-      "BOT_CONFIGURATION": "Bot Configuration"
+      "BOT_CONFIGURATION": "הגדרות בוט"
     },
     "SETTINGS": "הגדרות",
     "FEATURES": {
       "LABEL": "מאפיינים",
       "DISPLAY_FILE_PICKER": "הצג את בוחר הקבצים בווידג'ט",
       "DISPLAY_EMOJI_PICKER": "הצג את בוחר האמוג'י בווידג'ט",
-      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
+      "ALLOW_END_CONVERSATION": "אפשר למשתמשים לסיים שיחות באמצעות ה- Widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "סקריפט מסנג'ר",
       "MESSENGER_SUB_HEAD": "מקם את הכפתור הזה בתוך תג הגוף שלך",
       "INBOX_AGENTS": "סוכנים",
       "INBOX_AGENTS_SUB_TEXT": "הוסף או הסר נציגים מתיבת הדואר הנכנס הזו",
-      "AGENT_ASSIGNMENT": "Conversation Assignment",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "AGENT_ASSIGNMENT": "שיוך שיחה",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "עדכן הגדרות שיוך שיחה",
       "UPDATE": "עדכן",
       "ENABLE_EMAIL_COLLECT_BOX": "אפשר תיבת איסוף דוא\"ל",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "הפעל או השבת את תיבת איסוף הדוא\"ל בשיחה חדשה",
       "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.",
-      "LOCK_TO_SINGLE_CONVERSATION": "Lock to single conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "אפשר המשך שיחה באמצעות הדוא\"ל",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "שיחות ימשיכו באמצעות הדוא\"ל אם לאיש הקשר קיימת כתובת דוא\"ל תקנית.",
+      "LOCK_TO_SINGLE_CONVERSATION": "נעל לשיחה בודדת",
       "LOCK_TO_SINGLE_CONVERSATION_SUB_TEXT": "Enable or disable multiple conversations for the same contact in this inbox",
       "INBOX_UPDATE_TITLE": "הגדרות תיבת דואר נכנס",
       "INBOX_UPDATE_SUB_TEXT": "עדכן את הגדרות תיבת הדואר הנכנס שלך",
@@ -473,10 +473,11 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_TITLE": "API Key",
+      "WHATSAPP_SECTION_TITLE": "API key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "עדכן"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "עדכן",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 21ed0ccef..5f8a61d14 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -1,114 +1,114 @@
 {
   "PROFILE_SETTINGS": {
-    "LINK": "Profile Settings",
-    "TITLE": "Profile Settings",
-    "BTN_TEXT": "Update Profile",
+    "LINK": "הגדרות פרופיל",
+    "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",
-    "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",
+    "AVATAR_DELETE_SUCCESS": "תמונת פרופיל נמחקה בהצלחה",
+    "AVATAR_DELETE_FAILED": "אירעה שגיאה במחיקת תמונת הפרופיל, נסה שנית",
+    "UPDATE_SUCCESS": "הפרופיל עודכן בהצלחה",
+    "PASSWORD_UPDATE_SUCCESS": "הסיסמא שונתה בהצלחה",
+    "AFTER_EMAIL_CHANGED": "הפרופיל עודכן בהצלחה, יש להתחבר מחדש",
     "FORM": {
-      "AVATAR": "Profile Image",
+      "AVATAR": "תמונת פרופיל",
       "ERROR": "אנא תקן שגיאות בטופס",
-      "REMOVE_IMAGE": "Remove",
-      "UPLOAD_IMAGE": "Upload image",
-      "UPDATE_IMAGE": "Update image",
+      "REMOVE_IMAGE": "הסר",
+      "UPLOAD_IMAGE": "העלה תמונה",
+      "UPDATE_IMAGE": "עדכן תמונה",
       "PROFILE_SECTION": {
-        "TITLE": "Profile",
-        "NOTE": "Your email address is your identity and is used to log in."
+        "TITLE": "פרופיל",
+        "NOTE": "כתובת המייל שלך משמשת להתחברות."
       },
       "SEND_MESSAGE": {
-        "TITLE": "Hotkey to send messages",
-        "NOTE": "You can select a hotkey (either Enter or Cmd/Ctrl+Enter) based on your preference of writing.",
-        "UPDATE_SUCCESS": "Your settings have been updated successfully",
+        "TITLE": "מקשים חמים לשליחת הודעות",
+        "NOTE": "תוכל לבחור מקש חם (באמצעות Enter או Cmd/Ctrl+Enter) בהתאם להעדפות הכתיבה שלך.",
+        "UPDATE_SUCCESS": "ההגדרות עודכנו בהצלחה",
         "CARD": {
           "ENTER_KEY": {
-            "HEADING": "Enter (↵)",
-            "CONTENT": "Send messages by pressing Enter key instead of clicking the send button."
+            "HEADING": "אישור (↵)",
+            "CONTENT": "שלח הודעות באמצעות הקשת Enter במקום ללחוץ על כפתור השליחה."
           },
           "CMD_ENTER_KEY": {
             "HEADING": "Cmd/Ctrl + Enter (⌘ + ↵)",
-            "CONTENT": "Send messages by pressing Cmd/Ctrl + enter key instead of clicking the send button."
+            "CONTENT": "שלח הודעות באמצעות הקשת Cmd/Ctrl + Enter במקום ללחוץ על כפתור השליחה."
           }
         }
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from your email inbox. 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"
+        "TITLE": "חתימת הודעה אישית",
+        "NOTE": "ניתן לרשום חתימה לכל ההודעות שתרשום ללקוחות שלך.",
+        "BTN_TEXT": "שמירה",
+        "API_ERROR": "לא ניתן לשמור את החתימה! אנא נסה שנית",
+        "API_SUCCESS": "החתימה נשמרה בהצלחה"
       },
       "MESSAGE_SIGNATURE": {
-        "LABEL": "Message Signature",
-        "ERROR": "Message Signature cannot be empty",
-        "PLACEHOLDER": "Insert your personal message signature here."
+        "LABEL": "חתימת הודעה",
+        "ERROR": "חתימת הודעה לא יכולה להיות ריקה",
+        "PLACEHOLDER": "הכנס כאן את חתימת ההודעה האישית שלך."
       },
       "PASSWORD_SECTION": {
         "TITLE": "סיסמה",
-        "NOTE": "Updating your password would reset your logins in multiple devices.",
-        "BTN_TEXT": "Change password"
+        "NOTE": "עדכון הסיסמה שלך יאפס את הכניסות שלך במספר מכשירים.",
+        "BTN_TEXT": "שנה סיסמא"
       },
       "ACCESS_TOKEN": {
-        "TITLE": "Access Token",
-        "NOTE": "This token can be used if you are building an API based integration"
+        "TITLE": "Token",
+        "NOTE": "משמש לחיבורי API"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
-        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "TITLE": "התראות קוליות",
+        "NOTE": "אפשר התראות קוליות להודעות ושיחות חדשות.",
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "סוגי התראות:",
           "NONE": "כלום",
-          "ASSIGNED": "Assigned Conversations",
-          "ALL_CONVERSATIONS": "All Conversations"
+          "ASSIGNED": "שיחות משוייכות",
+          "ALL_CONVERSATIONS": "כל השיחות"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "צליל התראה:"
         },
         "CONDITIONS": {
-          "TITLE": "Alert conditions:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
-          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+          "TITLE": "העדפות התראה:",
+          "CONDITION_ONE": "שלח התראות קוליות רק במידה והדפדפן לא פעיל",
+          "CONDITION_TWO": "שלח התראות כל 30 שניות עד שכל ההודעות המשוייכות נקראו"
         }
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
-        "TITLE": "Email Notifications",
-        "NOTE": "Update your email notification preferences here",
+        "TITLE": "התראות דוא\"ל",
+        "NOTE": "עדכן כאן את העדפות קבלת ההתראות בדוא''ל",
         "CONVERSATION_ASSIGNMENT": "שלח התראה באימייל כאשר שיחה מוקצית עבורי",
         "CONVERSATION_CREATION": "שלח התראה באימייל כאשר נפתחת שיחה חדשה",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "שלח הודעות דחיפה כאשר אתה מוזכר בשיחה",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "שלח התראה באימייל כאשר יש הודעה חדשה בשיחה המוקצית עבורי",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "שלח הודעות דחיפה כאשר נוצרת הודעה חדשה בשיחה המיועדת עבורי"
       },
       "API": {
-        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
-        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+        "UPDATE_SUCCESS": "העדפות ההתראות עודכנו בהצלחה",
+        "UPDATE_ERROR": "אירעה שגיאה בעדכון ההעדפות, אנא נסה שנית"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Push Notifications",
-        "NOTE": "Update your push notification preferences here",
+        "TITLE": "הודעות דחיפה (Push)",
+        "NOTE": "עדכן כאן את העדפות קבלת הודעות הדחיפה שלך",
         "CONVERSATION_ASSIGNMENT": "שלח התראת פוש כאשר שיחה מוקצית עבורי",
         "CONVERSATION_CREATION": "שלח התראת פוש כאשר נפתחת שיחה חדשה",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "שלח הודעות דחיפה כאשר אתה מוזכר בשיחה",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "שלח התראת פוש כאשר יש הודעה חדשה בשיחה המוקצית עבורי",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "שלח הודעות דחיפה כאשר נוצרת הודעה חדשה בשיחה המיועדת עבורי",
+        "HAS_ENABLED_PUSH": "הודעות דחיפה בדפדפן זה הופעלו.",
+        "REQUEST_PUSH": "אפשר הודעות דחיפה"
       },
       "PROFILE_IMAGE": {
-        "LABEL": "Profile Image"
+        "LABEL": "תמונת פרופיל"
       },
       "NAME": {
-        "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
+        "LABEL": "שמך המלא",
+        "ERROR": "נא הכנס שם תקני",
         "PLACEHOLDER": "הכנס שם מלא בבקשה"
       },
       "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": "שם תצוגה",
+        "ERROR": "נא הכנס שם תצוגה תקני",
+        "PLACEHOLDER": "נא הכנס שם תצוגה, שם זה יוצג בשיחות"
       },
       "AVAILABILITY": {
         "LABEL": "זמינות",
@@ -117,16 +117,16 @@
           "עסוק",
           "לא מחובר"
         ],
-        "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
-        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
+        "SET_AVAILABILITY_SUCCESS": "זמינות הוגדרה בהצלחה",
+        "SET_AVAILABILITY_ERROR": "לא ניתן להגדיר זמינות, אנא נסה שנית"
       },
       "EMAIL": {
-        "LABEL": "Your email address",
-        "ERROR": "Please enter a valid email address",
-        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+        "LABEL": "כתובת הדוא\"ל שלך",
+        "ERROR": "נא הכנס כתובת דוא\"ל תקינה",
+        "PLACEHOLDER": "נא הכנס את כתובת הדוא\"ל שלך, כתובת זו תוצג בשיחות"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
+        "LABEL": "סיסמא נוכחית",
         "ERROR": "Please enter the current password",
         "PLACEHOLDER": "Please enter the current password"
       },
@@ -147,7 +147,7 @@
     "CHANGE_ACCOUNTS": "החלף חשבון",
     "CONTACT_SUPPORT": "Contact Support",
     "SELECTOR_SUBTITLE": "Select an account from the following list",
-    "PROFILE_SETTINGS": "Profile Settings",
+    "PROFILE_SETTINGS": "הגדרות פרופיל",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
     "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "התנתק"
@@ -192,7 +192,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "שיחות",
-    "ALL_CONVERSATIONS": "All Conversations",
+    "ALL_CONVERSATIONS": "כל השיחות",
     "MENTIONED_CONVERSATIONS": "אִזְכּוּרים",
     "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
@@ -206,7 +206,7 @@
     "NOTIFICATIONS": "התראות",
     "CANNED_RESPONSES": "תגובות מוכנות",
     "INTEGRATIONS": "אינטגרציות",
-    "PROFILE_SETTINGS": "Profile Settings",
+    "PROFILE_SETTINGS": "הגדרות פרופיל",
     "ACCOUNT_SETTINGS": "Account Settings",
     "APPLICATIONS": "יישומים",
     "LABELS": "Labels",
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index 3ff61ade7..fa12859ec 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index d319e8377..75f29cb9c 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Frissítés"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Frissítés",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index 1370e3035..529910eff 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Perbarui"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Perbarui",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
index 279b50873..b06848cec 100644
--- a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Lykill",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppfæra"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppfæra",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index a1f9ba775..8f2b271b9 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Chiave API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aggiorna"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aggiorna",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limite assegnazione automatica",
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index e1131e5e9..ed65659f6 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "更新"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index 3ff61ade7..fa12859ec 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index 1cf8c54ae..cfe113466 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "업데이트"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "업데이트",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index 3ff61ade7..fa12859ec 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index dd858b6c2..ebb067826 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API atslēga",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atjaunināt API atslēgu",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Ievadiet šeit jauno API atslēgu",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Atjaunināt"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Atjaunināt",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atjaunināt pirms-tērzēšanas veidlapas iestatījumus"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Automātiskās piešķiršanas ierobežojums",
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 22068f2ea..0adb36e5a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "അപ്‌ഡേറ്റ്"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "അപ്‌ഡേറ്റ്",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index d96859aa6..d6007fa1c 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 6d91c79ac..9e58681c6 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 9edfc847d..2bdd8e8d6 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Vernieuwen"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Vernieuwen",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index d1d285b8a..dd8bd0f07 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Oppdater"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Oppdater",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index df75948eb..77a65128a 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Klucz API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizuj"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizuj",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 863672894..5425f1903 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -264,19 +264,19 @@
     "REMANING_PARTICIPANT_TEXT": "+%{count} outro",
     "TOTAL_PARTICIPANTS_TEXT": "%{count} pessoas estão participando.",
     "TOTAL_PARTICIPANT_TEXT": "%{count} pessoa está participando.",
-    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
-    "WATCH_CONVERSATION": "Join conversation",
-    "YOU_ARE_WATCHING": "You are participating",
+    "NO_PARTICIPANTS_TEXT": "Ninguém está participando!",
+    "WATCH_CONVERSATION": "Junte-se a conversa",
+    "YOU_ARE_WATCHING": "Você está participando",
     "API": {
-      "ERROR_MESSAGE": "Could not update, try again!",
-      "SUCCESS_MESSAGE": "Participants updated!"
+      "ERROR_MESSAGE": "Não foi possível atualizar, tente novamente!",
+      "SUCCESS_MESSAGE": "Participantes atualizados!"
     }
   },
   "TRANSLATE_MODAL": {
-    "TITLE": "View translated content",
-    "DESC": "You can view the translated content in each langauge.",
-    "ORIGINAL_CONTENT": "Original Content",
-    "TRANSLATED_CONTENT": "Translated Content",
-    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
+    "TITLE": "Ver conteúdo traduzido",
+    "DESC": "Você pode visualizar o conteúdo traduzido em cada idioma.",
+    "ORIGINAL_CONTENT": "Conteúdo Original",
+    "TRANSLATED_CONTENT": "Conteúdo Traduzido",
+    "NO_TRANSLATIONS_AVAILABLE": "Nenhuma tradução está disponível para este conteúdo"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index a7fcc5a4f..26edfa9c6 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -15,7 +15,7 @@
       },
       "ACCOUNT_ID": {
         "TITLE": "Conta ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "NOTE": "Este ID é necessário se você está construindo uma integração baseada em API"
       },
       "NAME": {
         "LABEL": "Nome da Conta",
@@ -23,7 +23,7 @@
         "ERROR": "Por favor, insira um nome de conta válido"
       },
       "LANGUAGE": {
-        "LABEL": "Site language",
+        "LABEL": "Idioma do site",
         "PLACEHOLDER": "Nome da sua conta",
         "ERROR": ""
       },
@@ -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": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Por favor, informe 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 sua conta tem a opção de continuar as conversas por e-mail ativa.",
@@ -55,18 +55,18 @@
       "ENTER_TO_SELECT": "Pressione Enter para escolher",
       "ENTER_TO_REMOVE": "Pressione Enter para eliminar",
       "SELECT_ONE": "Selecionar um",
-      "SELECT": "Select"
+      "SELECT": "Selecionar"
     }
   },
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notificaçoes",
     "MARK_ALL_DONE": "Marcar todos como Resolvidos",
-    "DELETE_TITLE": "deleted",
+    "DELETE_TITLE": "excluído",
     "UNREAD_NOTIFICATION": {
-      "TITLE": "Unread Notifications",
-      "ALL_NOTIFICATIONS": "View all notifications",
-      "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
-      "EMPTY_MESSAGE": "You have no unread notifications"
+      "TITLE": "Notificações Não Lidas",
+      "ALL_NOTIFICATIONS": "Ver todas as notificações",
+      "LOADING_UNREAD_MESSAGE": "Carregando notificações não lidas...",
+      "EMPTY_MESSAGE": "Você não tem notificações não lidas"
     },
     "LIST": {
       "LOADING_MESSAGE": "A carregar notificações...",
@@ -110,7 +110,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Ir para o painel de conversação",
       "GO_TO_CONTACTS_DASHBOARD": "Ir para o painel de contatos",
       "GO_TO_REPORTS_OVERVIEW": "Ir para Visão Geral de Relatórios",
-      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
+      "GO_TO_CONVERSATION_REPORTS": "Ir para Relatórios de Conversa",
       "GO_TO_AGENT_REPORTS": "Ir para Relatórios de Agentes",
       "GO_TO_LABEL_REPORTS": "Ir para Relatórios de Etiquetas",
       "GO_TO_INBOX_REPORTS": "Ir para Relatórios da Caixa de Entrada",
@@ -133,13 +133,13 @@
       "REOPEN_CONVERSATION": "Reabrir conversa",
       "RESOLVE_CONVERSATION": "Resolver conversa",
       "SEND_TRANSCRIPT": "Enviar transcrição por e-mail",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
+      "SNOOZE_CONVERSATION": "Adiar Conversa",
       "UNTIL_NEXT_REPLY": "Até à próxima resposta",
       "UNTIL_NEXT_WEEK": "Até à próxima semana",
       "UNTIL_TOMORROW": "Até amanhã"
     }
   },
   "DASHBOARD_APPS": {
-    "LOADING_MESSAGE": "Loading Dashboard App..."
+    "LOADING_MESSAGE": "Carregando App da Dashboard..."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
index 4a9d4bbeb..4ed8ea245 100644
--- a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
@@ -7,18 +7,18 @@
       "NEW_BUTTON": "New Article",
       "DROPDOWN_OPTIONS": {
         "PUBLISHED": "Published",
-        "DRAFT": "Draft",
-        "ARCHIVED": "Archived"
+        "DRAFT": "Rascunho",
+        "ARCHIVED": "Arquivado"
       },
       "TITLES": {
-        "ALL_ARTICLES": "All Articles",
-        "MINE": "My Articles",
+        "ALL_ARTICLES": "Todos os Artigos",
+        "MINE": "Meus Artigos",
         "DRAFT": "Draft Articles",
         "ARCHIVED": "Archived Articles"
       }
     },
     "EDIT_HEADER": {
-      "ALL_ARTICLES": "All Articles",
+      "ALL_ARTICLES": "Todos os Artigos",
       "PUBLISH_BUTTON": "Publish",
       "MOVE_TO_ARCHIVE_BUTTON": "Move to archived",
       "PREVIEW": "Preview",
@@ -76,7 +76,7 @@
     },
     "PORTAL": {
       "HEADER": "Portals",
-      "DEFAULT": "Default",
+      "DEFAULT": "Padrão",
       "NEW_BUTTON": "New Portal",
       "ACTIVE_BADGE": "ativa",
       "CHOOSE_LOCALE_LABEL": "Choose a locale",
@@ -120,7 +120,7 @@
               "CATEGORIES": "No. of categories",
               "SWAP": "Swap",
               "DELETE": "excluir",
-              "DEFAULT_LOCALE": "Default"
+              "DEFAULT_LOCALE": "Padrão"
             }
           }
         },
@@ -163,7 +163,7 @@
               "EDIT": "Edit category",
               "DELETE": "Delete category"
             },
-            "EMPTY_TEXT": "No categories found"
+            "EMPTY_TEXT": "Nenhuma categoria encontrada"
           }
         },
         "EDIT_BASIC_INFO": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index d18ff4782..52d68768a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -31,7 +31,7 @@
       "CHANNEL_NAME": {
         "LABEL": "Nome da Caixa de Entrada",
         "PLACEHOLDER": "Digite o nome da caixa de entrada (ex: Informatico. pt)",
-        "ERROR": "Please enter a valid inbox name"
+        "ERROR": "Por favor, insira um nome de caixa de entrada válido"
       },
       "WEBSITE_NAME": {
         "LABEL": "Nome do site",
@@ -50,7 +50,7 @@
         "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' ",
         "ERROR_MESSAGE": "Houve um de ligação com o Twitter, por favor, tente novamente",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Criar conversas a partir dos Tweets mencionados"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -83,7 +83,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Ativar mensagem de Boas-vindas do canal",
-          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
+          "HELP_TEXT": "Enviar automaticamente uma mensagem de saudação quando uma nova conversa for criada.",
           "ENABLED": "Ativado",
           "DISABLED": "Desabilitado"
         },
@@ -100,22 +100,22 @@
         },
         "SUBMIT_BUTTON": "Criar caixa de entrada",
         "API": {
-          "ERROR_MESSAGE": "We were not able to create a website channel, please try again"
+          "ERROR_MESSAGE": "Não conseguimos criar um canal de website. Por favor, tente novamente."
         }
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Canal SMS/WhatsApp da Twilio",
+        "DESC": "Integre o Twilio e comece a oferecer suporte a seus clientes por SMS ou WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "SID da Conta",
           "PLACEHOLDER": "Por favor, insira sua Conta Twilio SID",
           "ERROR": "Este campo é obrigatório"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "LABEL": "SID do Serviço de Mensagens",
+          "PLACEHOLDER": "Por favor, insira o seu SID do Serviço de Mensagens da Twilio",
           "ERROR": "Este campo é obrigatório",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "USE_MESSAGING_SERVICE": "Use um Serviço de Mensagens da Twilio"
         },
         "CHANNEL_TYPE": {
           "LABEL": "Tipo de canal",
@@ -134,7 +134,7 @@
         "PHONE_NUMBER": {
           "LABEL": "Número de telefone",
           "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "Por favor, forneça um número de telefone válido que começa com o sinal de `+` e que não contenha quaisquer espaços."
         },
         "API_CALLBACK": {
           "TITLE": "Link de retorno de ligação",
@@ -185,7 +185,7 @@
           "PHONE_NUMBER": {
             "LABEL": "Número de telefone",
             "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
-            "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+            "ERROR": "Por favor, forneça um número de telefone válido que começa com o sinal de `+` e que não contenha quaisquer espaços."
           },
           "SUBMIT_BUTTON": "Create Bandwidth Channel",
           "API": {
@@ -214,20 +214,20 @@
         "PHONE_NUMBER": {
           "LABEL": "Número de telefone",
           "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "Por favor, forneça um número de telefone válido que começa com o sinal de `+` e que não contenha quaisquer espaços."
         },
         "PHONE_NUMBER_ID": {
-          "LABEL": "Phone number ID",
+          "LABEL": "ID do número de telefone",
           "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
           "ERROR": "Por favor, insira um valor válido."
         },
         "BUSINESS_ACCOUNT_ID": {
-          "LABEL": "Business Account ID",
+          "LABEL": "ID da Conta de Empresa",
           "PLACEHOLDER": "Please enter the Business Account ID obtained from Facebook developer dashboard.",
           "ERROR": "Por favor, insira um valor válido."
         },
         "WEBHOOK_VERIFY_TOKEN": {
-          "LABEL": "Webhook Verify Token",
+          "LABEL": "Webhook de Verificação de Token",
           "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
           "ERROR": "Por favor, insira um valor válido."
         },
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Chave da API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualização"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualização",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
@@ -542,8 +543,8 @@
       "TOGGLE_AVAILABILITY": "Ativar a configuração IMAP para esta caixa de entrada",
       "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"
+        "SUCCESS_MESSAGE": "Configurações IMAP atualizadas com sucesso",
+        "ERROR_MESSAGE": "Não foi possível atualizar as configurações do IMAP"
       },
       "ADDRESS": {
         "LABEL": "Endereço",
@@ -565,7 +566,7 @@
     },
     "MICROSOFT": {
       "TITLE": "Microsoft",
-      "SUBTITLE": "Reauthorize your MICROSOFT account"
+      "SUBTITLE": "Autorizar novamente sua conta MICROSOFT"
     },
     "SMTP": {
       "TITLE": "SMTP",
@@ -575,7 +576,7 @@
       "TOGGLE_HELP": "Habilitar o SMTP irá ajudar o usuário a enviar e-mail",
       "EDIT": {
         "SUCCESS_MESSAGE": "Configurações de SMTP atualizadas com sucesso",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "ERROR_MESSAGE": "Não é possível atualizar configurações de SMTP"
       },
       "ADDRESS": {
         "LABEL": "Endereço",
@@ -601,16 +602,16 @@
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
       "OPEN_SSL_VERIFY_MODE": "Abrir Modo de Verificação SSL",
-      "AUTH_MECHANISM": "Authentication"
+      "AUTH_MECHANISM": "Autenticação"
     },
-    "NOTE": "Note: ",
+    "NOTE": "Observação: ",
     "WIDGET_BUILDER": {
       "WIDGET_OPTIONS": {
         "AVATAR": {
-          "LABEL": "Website Avatar",
+          "LABEL": "Avatar do Website",
           "DELETE": {
             "API": {
-              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "SUCCESS_MESSAGE": "Avatar removido com sucesso",
               "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
             }
           }
@@ -618,52 +619,52 @@
         "WEBSITE_NAME": {
           "LABEL": "Nome do site",
           "PLACE_HOLDER": "Digite o nome do seu site (por exemplo: Acme Inc)",
-          "ERROR": "Please enter a valid website name"
+          "ERROR": "Por favor, digite um nome de website válido"
         },
         "WELCOME_HEADING": {
           "LABEL": "Título de Boas-Vindas",
-          "PLACE_HOLDER": "Hi there!"
+          "PLACE_HOLDER": "Olá!"
         },
         "WELCOME_TAGLINE": {
           "LABEL": "Bem-vindo Slogan",
           "PLACE_HOLDER": "Nós simplificamos nos conectar com a gente. Pergunte a nós qualquer coisa ou compartilhe seus comentários."
         },
         "REPLY_TIME": {
-          "LABEL": "Reply Time",
+          "LABEL": "Tempo de Resposta",
           "IN_A_FEW_MINUTES": "Em poucos minutos",
           "IN_A_FEW_HOURS": "Em poucas horas",
           "IN_A_DAY": "Dentro de um dia"
         },
         "WIDGET_COLOR_LABEL": "Cor do widget",
-        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
-        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Posição do Balão de Widget",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Tipo de Balão de Widget",
         "WIDGET_BUBBLE_LAUNCHER_TITLE": {
           "DEFAULT": "Fale connosco",
-          "LABEL": "Widget Bubble Launcher Title",
+          "LABEL": "Título do Iniciado do Widget",
           "PLACE_HOLDER": "Fale connosco"
         },
         "UPDATE": {
-          "BUTTON_TEXT": "Update Widget Settings",
+          "BUTTON_TEXT": "Atualizar Configurações do Widget",
           "API": {
-            "SUCCESS_MESSAGE": "Widget settings updated successfully",
-            "ERROR_MESSAGE": "Unable to update widget settings"
+            "SUCCESS_MESSAGE": "Configurações do widget atualizadas com sucesso",
+            "ERROR_MESSAGE": "Não é possível atualizar as configurações do widget"
           }
         },
         "WIDGET_VIEW_OPTION": {
-          "PREVIEW": "Preview",
+          "PREVIEW": "Pré-visualizar",
           "SCRIPT": "Script"
         },
         "WIDGET_BUBBLE_POSITION": {
-          "LEFT": "Left",
-          "RIGHT": "Right"
+          "LEFT": "Esquerda",
+          "RIGHT": "Direita"
         },
         "WIDGET_BUBBLE_TYPE": {
-          "STANDARD": "Standard",
-          "EXPANDED_BUBBLE": "Expanded Bubble"
+          "STANDARD": "Padrão",
+          "EXPANDED_BUBBLE": "Balão Expandido"
         }
       },
       "WIDGET_SCREEN": {
-        "DEFAULT": "Default",
+        "DEFAULT": "Padrão",
         "CHAT": "Chat"
       },
       "REPLY_TIME": {
@@ -677,18 +678,18 @@
       },
       "BODY": {
         "TEAM_AVAILABILITY": {
-          "ONLINE": "We are Online",
+          "ONLINE": "Estamos online",
           "OFFLINE": "Estamos ausentes"
         },
-        "USER_MESSAGE": "Hi",
-        "AGENT_MESSAGE": "Hello"
+        "USER_MESSAGE": "Oi",
+        "AGENT_MESSAGE": "Olá"
       },
       "BRANDING_TEXT": "Desenvolvido por Chatwoot",
       "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
     },
     "EMAIL_PROVIDERS": {
       "MICROSOFT": "Microsoft",
-      "OTHER_PROVIDERS": "Other Providers"
+      "OTHER_PROVIDERS": "Outros Provedores"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 7e4f5420a..5f5d8a9dc 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -2,21 +2,21 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrações",
     "WEBHOOK": {
-      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "SUBSCRIBED_EVENTS": "Eventos Inscritos",
       "FORM": {
         "CANCEL": "cancelar",
         "DESC": "Eventos Webhook fornecem informações em tempo real sobre o que está acontecendo em sua conta Chatwoot. Por favor, insira uma URL válida para configurar uma callback.",
         "SUBSCRIPTIONS": {
-          "LABEL": "Events",
+          "LABEL": "Eventos",
           "EVENTS": {
-            "CONVERSATION_CREATED": "Conversation Created",
-            "CONVERSATION_STATUS_CHANGED": "Conversation Status Changed",
-            "CONVERSATION_UPDATED": "Conversation Updated",
-            "MESSAGE_CREATED": "Message created",
-            "MESSAGE_UPDATED": "Message updated",
-            "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
-            "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONVERSATION_CREATED": "Conversa Criada",
+            "CONVERSATION_STATUS_CHANGED": "Status da Conversa Alterado",
+            "CONVERSATION_UPDATED": "Conversa Atualizada",
+            "MESSAGE_CREATED": "Mensagem criada",
+            "MESSAGE_UPDATED": "Mensagem atualizada",
+            "WEBWIDGET_TRIGGERED": "Widget de bate-papo aberto pelo usuário",
+            "CONTACT_CREATED": "Contacto criado",
+            "CONTACT_UPDATED": "Contato atualizado"
           }
         },
         "END_POINT": {
@@ -24,7 +24,7 @@
           "PLACEHOLDER": "Exemplo: https://example/api/webhook",
           "ERROR": "Por favor, insira uma URL válida"
         },
-        "EDIT_SUBMIT": "Update webhook",
+        "EDIT_SUBMIT": "Atualizar webhook",
         "ADD_SUBMIT": "Criar webhook"
       },
       "TITLE": "Webhook",
@@ -46,7 +46,7 @@
         "BUTTON_TEXT": "Alterar",
         "TITLE": "Editar Webhooks",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
+          "SUCCESS_MESSAGE": "Configuração de webhook atualizada com sucesso",
           "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
         }
       },
@@ -54,7 +54,7 @@
         "CANCEL": "cancelar",
         "TITLE": "Adicionar novo webhook",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
+          "SUCCESS_MESSAGE": "Configuração de webhook adicionada com sucesso",
           "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
         }
       },
@@ -66,7 +66,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmar Exclusão",
-          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
+          "MESSAGE": "Tem certeza que deseja excluir o webhoook? (%{webhookURL})",
           "YES": "Sim, excluir ",
           "NO": "Não, mantenha isso"
         }
@@ -79,10 +79,10 @@
       }
     },
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the room",
-      "START_VIDEO_CALL_HELP_TEXT": "Start a new video call with the customer",
-      "JOIN_ERROR": "There was an error joining the call, please try again",
+      "CLICK_HERE_TO_JOIN": "Clique aqui para participar",
+      "LEAVE_THE_ROOM": "Deixar a sala",
+      "START_VIDEO_CALL_HELP_TEXT": "Iniciar uma nova chamada de vídeo com o cliente",
+      "JOIN_ERROR": "Houve um erro ao ingressar na chamada! Por favor, tente novamente",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 5e5f0f3e9..e87a635ed 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -59,16 +59,16 @@
         "TITLE": "Notificações de som",
         "NOTE": "Ativar notificações de som no painel quando surgirem novas mensagens e conversas.",
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Eventos de alerta:",
           "NONE": "Nenhuma",
           "ASSIGNED": "Conversas atribuídas",
           "ALL_CONVERSATIONS": "Todas as conversas"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "Tom do alerta:"
         },
         "CONDITIONS": {
-          "TITLE": "Alert conditions:",
+          "TITLE": "Condições de alerta:",
           "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
           "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
         }
@@ -167,8 +167,8 @@
       "COPY_SUCCESSFUL": "Código copiado com sucesso para área de transferência"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "Mostrar mais",
+      "SHOW_LESS": "Mostrar menos"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "BAIXAR",
@@ -176,7 +176,7 @@
       "INSTAGRAM_STORY_UNAVAILABLE": "This story is no longer available."
     },
     "LOCATION_BUBBLE": {
-      "SEE_ON_MAP": "See on map"
+      "SEE_ON_MAP": "Veja no mapa"
     },
     "FORM_BUBBLE": {
       "SUBMIT": "submeter"
@@ -189,8 +189,8 @@
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
-    "SWITCH": "Switch",
+    "CURRENTLY_VIEWING_ACCOUNT": "Atualmente visualizando:",
+    "SWITCH": "Alternar",
     "CONVERSATIONS": "Conversas",
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
@@ -214,7 +214,7 @@
     "AUTOMATION": "Automatização",
     "MACROS": "Macros",
     "TEAMS": "Equipas",
-    "BILLING": "Billing",
+    "BILLING": "Cobrança",
     "CUSTOM_VIEWS_FOLDER": "Pastas",
     "CUSTOM_VIEWS_SEGMENTS": "Segmentos",
     "ALL_CONTACTS": "Todos os contatos",
@@ -236,23 +236,23 @@
     "REPORTS_OVERVIEW": "Visão geral",
     "FACEBOOK_REAUTHORIZE": "A sua ligação ao Facebook caducou, volte a ligar a página para poder continuar a utilizar os serviços",
     "HELP_CENTER": {
-      "TITLE": "Help Center (Beta)",
-      "ALL_ARTICLES": "All Articles",
-      "MY_ARTICLES": "My Articles",
-      "DRAFT": "Draft",
-      "ARCHIVED": "Archived",
-      "CATEGORY": "Category",
+      "TITLE": "Centro de Ajuda (Beta)",
+      "ALL_ARTICLES": "Todos os Artigos",
+      "MY_ARTICLES": "Meus Artigos",
+      "DRAFT": "Rascunho",
+      "ARCHIVED": "Arquivado",
+      "CATEGORY": "Categoria",
       "SETTINGS": "Confirgurações",
-      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+      "CATEGORY_EMPTY_MESSAGE": "Nenhuma categoria encontrada"
     },
     "SET_AUTO_OFFLINE": {
-      "TEXT": "Mark offline automatically",
+      "TEXT": "Marcar offline automaticamente",
       "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard."
     },
     "DOCS": "Read docs"
   },
   "BILLING_SETTINGS": {
-    "TITLE": "Billing",
+    "TITLE": "Cobrança",
     "CURRENT_PLAN": {
       "TITLE": "Current Plan",
       "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
diff --git a/app/javascript/dashboard/i18n/locale/pt/signup.json b/app/javascript/dashboard/i18n/locale/pt/signup.json
index 3492df3e3..2d9efa5d4 100644
--- a/app/javascript/dashboard/i18n/locale/pt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt/signup.json
@@ -9,7 +9,7 @@
       "GOOGLE_SIGNUP": "Sign up with Google"
     },
     "COMPANY_NAME": {
-      "LABEL": "Company name",
+      "LABEL": "Nome da empresa",
       "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
       "ERROR": "Company name is too short"
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 1774a95f5..b9dfadab4 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Chave API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atualizar Chave de API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Digite a nova chave de API aqui",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualizar"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualizar",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limite de atribuição automática",
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 4321dbb16..7b4c8211b 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Cheie API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizare"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizare",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 69e3bd258..0303404c0 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Ключ API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновить"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновить",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Авто распределение лимита",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index e63c4ac67..36e05ca72 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API kľúč",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index ea1c44f2b..af8e576d3 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API ključ",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Primeni"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Primeni",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Ograničenje automatskog dodeljivanja",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 01a479716..53d00bc74 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppdatera"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppdatera",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 6bc393741..e8562943b 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "புதுப்பிப்பு"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "புதுப்பிப்பு",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index fe7d8a92f..850e54f55 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "อัพเดท"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "อัพเดท",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index e08d9ba96..c1741e1f5 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Güncelleme"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Güncelleme",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index df3bca4ab..54f5012be 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API ключ",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Оновити"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Оновити",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Ліміт автопризначення",
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index c28d88f8f..9d005178b 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index 3ff61ade7..fa12859ec 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index ba24811e5..4cf0a3a30 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "Khoá API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Cập nhật"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Cập nhật",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Giới hạn tự động phân công tối đa",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index e5ca63097..6278673cf 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "更新"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 704c14d29..9053928e4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -476,7 +476,8 @@
       "WHATSAPP_SECTION_TITLE": "API Key",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "更新"
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 037a529d0..124e98221 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "الرجاء تقديم اسمك و بريدك الإلكتروني قبل بدء المحادثة",
-    "IS_REQUIRED": "مطلوب"
+    "IS_REQUIRED": "مطلوب",
+    "REQUIRED": "مطلوب"
   },
   "FILE_SIZE_LIMIT": "حجم الملف يتجاوز حد الاقصى وهو {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/bg.json b/app/javascript/widget/i18n/locale/bg.json
index cbea820c3..e03156151 100644
--- a/app/javascript/widget/i18n/locale/bg.json
+++ b/app/javascript/widget/i18n/locale/bg.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Преди да започенте разговора, моля, посочете вашето име и имейл адрес",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Файлът надхвърля {MAXIMUM_FILE_UPLOAD_SIZE} лимит",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index e6e1c7cd2..654aec8f5 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index 0fc9279ef..3ff5c8366 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Zadejte své jméno a e-mail před zahájením konverzace",
-    "IS_REQUIRED": "je vyžadováno"
+    "IS_REQUIRED": "je vyžadováno",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Soubor překračuje limit {MAXIMUM_FILE_UPLOAD_SIZE} přílohy",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 298149788..71fc5212c 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Angiv venligst dit navn og e-mail, før du starter samtalen",
-    "IS_REQUIRED": "er påkrævet"
+    "IS_REQUIRED": "er påkrævet",
+    "REQUIRED": "Påkrævet"
   },
   "FILE_SIZE_LIMIT": "Filen overskrider grænsen på {MAXIMUM_FILE_UPLOAD_SIZE} for vedhæftede filer",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index c80c76d87..fad57cebd 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Bitte geben Sie Ihren Namen und Ihre E-Mail-Adresse an, bevor Sie die Konversation beginnen",
-    "IS_REQUIRED": "erforderlich"
+    "IS_REQUIRED": "erforderlich",
+    "REQUIRED": "Benötigt"
   },
   "FILE_SIZE_LIMIT": "Die Datei überschreitet das Anhangslimit von {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index 10c747d26..ad9446892 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Παρακαλώ δώστε το όνομα και το email σας πριν ξεκινήσετε την συνομιλία",
-    "IS_REQUIRED": "είναι απαραίτητο"
+    "IS_REQUIRED": "είναι απαραίτητο",
+    "REQUIRED": "Υποχρεωτικό"
   },
   "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 7e8753ded..f01cfa65b 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Por favor, introduce tu nombre y correo electrónico antes de iniciar la conversación",
-    "IS_REQUIRED": "es obligatorio"
+    "IS_REQUIRED": "es obligatorio",
+    "REQUIRED": "Requerido"
   },
   "FILE_SIZE_LIMIT": "El archivo excede el límite de los archivos adjuntos {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index c043501bb..265305477 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "لطفا قبل از شروع گفتگو نام و ایمیل خود را وارد کنید",
-    "IS_REQUIRED": "مورد نیاز است"
+    "IS_REQUIRED": "مورد نیاز است",
+    "REQUIRED": "ضروری"
   },
   "FILE_SIZE_LIMIT": "فایل ضمیمه شده بیشتر از {MAXIMUM_FILE_UPLOAD_SIZE} است",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index 05f917174..78d614368 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 48edb0b71..1ad8e6c50 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Veuillez fournir votre nom et votre courriel avant de commencer la conversation",
-    "IS_REQUIRED": "est requis"
+    "IS_REQUIRED": "est requis",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Le fichier dépasse la limite de {MAXIMUM_FILE_UPLOAD_SIZE} pour les pièces jointes",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/he.json b/app/javascript/widget/i18n/locale/he.json
index 76c620e1c..7b8d45edc 100644
--- a/app/javascript/widget/i18n/locale/he.json
+++ b/app/javascript/widget/i18n/locale/he.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "קובץ חורג ממגבלת גודל מקסימלי {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index 141e9b102..0c286263d 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 4fde2c35d..0a97d8ac4 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Kérjük a beszélgetés megkezdése előtt add meg neved és e-mail címed",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "A file mérete meghaladja a {MAXIMUM_FILE_UPLOAD_SIZE} limitet",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index db6e2b96d..1783d638a 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File melebihi batas {MAXIMUM_FILE_UPLOAD_SIZE} lampiran",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/is.json b/app/javascript/widget/i18n/locale/is.json
index cdec64f16..1e7f6e5af 100644
--- a/app/javascript/widget/i18n/locale/is.json
+++ b/app/javascript/widget/i18n/locale/is.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Vinsamlegast sláðu inn nafn og netfang áður en samtalið hefst",
-    "IS_REQUIRED": "er nauðsynlegt"
+    "IS_REQUIRED": "er nauðsynlegt",
+    "REQUIRED": "Nauðsynlegt"
   },
   "FILE_SIZE_LIMIT": "Skráin fer framyfir hámarksstærð viðhengja ({MAXIMUM_FILE_UPLOAD_SIZE})",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index 6524c0918..6d34d7adf 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Per favore inserisci il tuo nome ed email prima di iniziare la conversazione",
-    "IS_REQUIRED": "è obbligatorio"
+    "IS_REQUIRED": "è obbligatorio",
+    "REQUIRED": "Obbligatorio"
   },
   "FILE_SIZE_LIMIT": "Il file supera il limite di {MAXIMUM_FILE_UPLOAD_SIZE} per poter essere allegato",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index 98a57b852..89d0ddbb4 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "添付ファイルサイズの上限 {MAXIMUM_FILE_UPLOAD_SIZE} を超えています",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ka.json b/app/javascript/widget/i18n/locale/ka.json
index 141e9b102..0c286263d 100644
--- a/app/javascript/widget/i18n/locale/ka.json
+++ b/app/javascript/widget/i18n/locale/ka.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index b6f404d9a..e8cb34157 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "첨부파일이 최대 {MAXIMUM_FILE_UPLOAD_SIZE} 용량 제한을 넘어섭니다.",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/lt.json b/app/javascript/widget/i18n/locale/lt.json
index 141e9b102..0c286263d 100644
--- a/app/javascript/widget/i18n/locale/lt.json
+++ b/app/javascript/widget/i18n/locale/lt.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/lv.json b/app/javascript/widget/i18n/locale/lv.json
index 258448c03..f0da9c131 100644
--- a/app/javascript/widget/i18n/locale/lv.json
+++ b/app/javascript/widget/i18n/locale/lv.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Lūdzu, pirms sarunas sākšanas, norādiet savu vārdu un e -pastu",
-    "IS_REQUIRED": "ir nepieciešams"
+    "IS_REQUIRED": "ir nepieciešams",
+    "REQUIRED": "Nepieciešams"
   },
   "FILE_SIZE_LIMIT": "Fails pārsniedz {MAXIMUM_FILE_UPLOAD_SIZE} pielikuma lieluma ierobežojumu",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index db9c22061..eadb67a70 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "സംഭാഷണം ആരംഭിക്കുന്നതിന് മുമ്പ് ദയവായി നിങ്ങളുടെ പേരും ഇമെയിലും നൽകുക",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "ഫയൽ {MAXIMUM_FILE_UPLOAD_SIZE} അറ്റാച്ച്‌മെന്റ് പരിധി കവിഞ്ഞു",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ms.json b/app/javascript/widget/i18n/locale/ms.json
index 60ca99d51..798a15bc6 100644
--- a/app/javascript/widget/i18n/locale/ms.json
+++ b/app/javascript/widget/i18n/locale/ms.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index b624bafed..3bebec328 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index 86e57b847..1e4e14e7f 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Geef uw naam en e-mail voordat u het gesprek begint",
-    "IS_REQUIRED": "is vereist"
+    "IS_REQUIRED": "is vereist",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Bestand overschrijdt de bijlagelimiet van {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index 7d56815f7..5324aab42 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Angi navn og e-post før du starter samtalen",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Filens størrelse overskrider grensen på {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index 9f25c6b3d..84695a580 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Proszę podać swoje imię i nazwisko oraz adres e-mail przed rozpoczęciem rozmowy",
-    "IS_REQUIRED": "jest wymagany"
+    "IS_REQUIRED": "jest wymagany",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index d2231de0e..9f72a127d 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Obrigatório"
   },
   "FILE_SIZE_LIMIT": "O ficheiro ultrapassa o tamanho limite {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
@@ -89,7 +90,7 @@
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
+      "CLICK_HERE_TO_JOIN": "Clique aqui para participar",
       "LEAVE_THE_ROOM": "Leave the call"
     }
   }
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 6aba7f5dd..f1f604b4d 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa",
-    "IS_REQUIRED": "é obrigatório"
+    "IS_REQUIRED": "é obrigatório",
+    "REQUIRED": "Obrigatório"
   },
   "FILE_SIZE_LIMIT": "O arquivo excede o limite de anexos {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index d71298e6e..4e10e73f2 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Vă rugăm să furnizați numele și e-mailul înainte de a începe conversația",
-    "IS_REQUIRED": "este obligatoriu"
+    "IS_REQUIRED": "este obligatoriu",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Fisierul depaseste limita de {MAXIMUM_FILE_UPLOAD_SIZE} atasamente",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index 2c6c59e77..5b4339f35 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Пожалуйста, укажите Ваше имя и адрес электронной почты перед началом диалога",
-    "IS_REQUIRED": "обязательно"
+    "IS_REQUIRED": "обязательно",
+    "REQUIRED": "Обязательно"
   },
   "FILE_SIZE_LIMIT": "Превышен размер загружаемого файла - {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 647eb4dac..cb4d47202 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Povinné"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sr.json b/app/javascript/widget/i18n/locale/sr.json
index e4391e938..ea06b5f76 100644
--- a/app/javascript/widget/i18n/locale/sr.json
+++ b/app/javascript/widget/i18n/locale/sr.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Molim vas dostavite vaše ime i e-poštu pre započinjanja razgovora",
-    "IS_REQUIRED": "je obavezno"
+    "IS_REQUIRED": "je obavezno",
+    "REQUIRED": "Obavezno"
   },
   "FILE_SIZE_LIMIT": "Datoteka prevazilazi {MAXIMUM_FILE_UPLOAD_SIZE} ograničenje priloga",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index b09684848..5de743532 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Ange ditt namn och e-post innan du startar konversationen",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "Filen överskrider gränsen för {MAXIMUM_FILE_UPLOAD_SIZE} bifogade filer",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index 7a25893d5..2433da3ea 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index 1b5be63b8..c95c9090b 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "โปรดแจ้งชื่อ และ อีเมลื ก่อนเริ่มการสนทนา",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "โปรดระบุ"
   },
   "FILE_SIZE_LIMIT": "ไฟล์ใหเกินกว่า {MAXIMUM_FILE_UPLOAD_SIZE} ที่กำหนดไว้",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index 13f97b96f..e9e07b9ec 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Görüşmeye başlamadan önce lütfen isminizi ve e-posta adresinizi belirtiniz",
-    "IS_REQUIRED": "zorunlu"
+    "IS_REQUIRED": "zorunlu",
+    "REQUIRED": "Zorunlu"
   },
   "FILE_SIZE_LIMIT": "Dosya {MAXIMUM_FILE_UPLOAD_SIZE} sınırını aşıyor",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index c92d84162..e535655b7 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Будь ласка, надайте своє ім'я та електронну пошту перед початком бесіди",
-    "IS_REQUIRED": "обов'язково"
+    "IS_REQUIRED": "обов'язково",
+    "REQUIRED": "Обов'язково"
   },
   "FILE_SIZE_LIMIT": "Файл перевищує ліміт вкладення {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ur.json b/app/javascript/widget/i18n/locale/ur.json
index 6771f4144..4ba79f4b1 100644
--- a/app/javascript/widget/i18n/locale/ur.json
+++ b/app/javascript/widget/i18n/locale/ur.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ur_IN.json b/app/javascript/widget/i18n/locale/ur_IN.json
index 141e9b102..0c286263d 100644
--- a/app/javascript/widget/i18n/locale/ur_IN.json
+++ b/app/javascript/widget/i18n/locale/ur_IN.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index e15bfe7b4..e80fb4a32 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "Vui lòng cung cấp tên và địa chỉ email của bạn trước khi bắt đầu hội thoại",
-    "IS_REQUIRED": "được yêu cầu"
+    "IS_REQUIRED": "được yêu cầu",
+    "REQUIRED": "Bắt buộc"
   },
   "FILE_SIZE_LIMIT": "Tệp vượt quá kích thước giới hạn {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index 089cb5449..1b2df6e0c 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "请在开始对话之前提供您的姓名和电子邮件",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "文件超过大小 {MAXIMUM_FILE_UPLOAD_SIZE} 附件限制",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index a4749ccf3..1ff183ac2 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -65,7 +65,8 @@
       }
     },
     "CAMPAIGN_HEADER": "在開始對話之前請提供您的名字及電郵",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
   },
   "FILE_SIZE_LIMIT": "{MAXIMUM_FILE_UPLOAD_SIZE} 已超出檔案大小限制",
   "CHAT_FORM": {
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 5a85e7e94..51b74a2d5 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -172,12 +172,12 @@ fa:
       sub_title: مقالات را در اینجا جستجو کنید یا دسته‌بندی‌های زیر را مرور کنید.
     common:
       home: صفحه اصلی
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
+      last_updated_on: آخرین به‌روزرسانی در تاریخ %{last_updated_on}
+      view_all_articles: مشاهده همه مقالات
+      article: مقاله
       articles: مقالات
-      no_articles: There are no articles here
+      no_articles: هنوز هیچ مقاله‌ای در اینجا وجود ندارد
     footer:
-      made_with: Made with
+      made_with: ساخته شده با
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: به سایت اصلی بروید
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 4b15dca11..e4484167e 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -172,12 +172,12 @@ lv:
       sub_title: Meklējiet rakstus šeit, vai pārlūkojiet tālāk norādītās kategorijas.
     common:
       home: Sākums
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
+      last_updated_on: Pēdējo reizi atjaunināts %{last_updated_on}
+      view_all_articles: Skatīt visus rakstus
+      article: raksts
       articles: raksti
-      no_articles: There are no articles here
+      no_articles: Šeit nav neviena raksta
     footer:
-      made_with: Made with
+      made_with: Veidots ar
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Doties uz galveno vietni
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 38bf311de..134ebfae9 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -172,12 +172,12 @@ pt:
       sub_title: Search for the articles here or browse the categories below.
     common:
       home: Principal
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
-      articles: articles
-      no_articles: There are no articles here
+      last_updated_on: Última atualização em %{last_updated_on}
+      view_all_articles: Ver todos os artigos
+      article: artigo
+      articles: artigos
+      no_articles: Não há artigos aqui
     footer:
-      made_with: Made with
+      made_with: Feito com
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Ir para o site principal
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 7d5fbebc7..ce39c1c77 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -172,12 +172,12 @@ pt_BR:
       sub_title: Pesquise os artigos aqui ou navegue pelas categorias abaixo.
     common:
       home: Principal
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
+      last_updated_on: Última atualização em %{last_updated_on}
+      view_all_articles: Ver todos os artigos
+      article: artigo
       articles: artigos
-      no_articles: There are no articles here
+      no_articles: Não há artigos aqui
     footer:
-      made_with: Made with
+      made_with: Criado com
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Ir para o site principal
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 527e8fca2..93e331f76 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -172,12 +172,12 @@ ru:
       sub_title: Ищите здесь статьи или выберите категории, указанные ниже.
     common:
       home: Главная
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
+      last_updated_on: Обновлено %{last_updated_on}
+      view_all_articles: Показать все статьи
+      article: статья
       articles: статьи
-      no_articles: There are no articles here
+      no_articles: Здесь нет статей
     footer:
-      made_with: Made with
+      made_with: Сделано с
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Перейти на основной сайт

From 34a2486e9c61f99ebd98996a581ede98919e4a6c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 1 Mar 2023 15:42:48 +0530
Subject: [PATCH 46/94] chore: Support plus forwarding in email channel (#6482)

- Support for plus forwarding in the email addresses for email channels

Co-authored-by: Sojan <sojan@pepalo.com>
---
 app/finders/email_channel_finder.rb       |  5 ++++-
 app/helpers/email_helper.rb               |  7 +++++++
 spec/finders/email_channel_finder_spec.rb |  7 +++++++
 spec/helpers/email_helper_spec.rb         | 19 +++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 spec/helpers/email_helper_spec.rb

diff --git a/app/finders/email_channel_finder.rb b/app/finders/email_channel_finder.rb
index 1c8eaeaf2..3fb7edd53 100644
--- a/app/finders/email_channel_finder.rb
+++ b/app/finders/email_channel_finder.rb
@@ -1,4 +1,6 @@
 class EmailChannelFinder
+  include EmailHelper
+
   def initialize(email_object)
     @email_object = email_object
   end
@@ -7,7 +9,8 @@ class EmailChannelFinder
     channel = nil
     recipient_mails = @email_object.to.to_a + @email_object.cc.to_a
     recipient_mails.each do |email|
-      channel = Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', email.downcase, email.downcase)
+      normalized_email = normalize_email_with_plus_addressing(email)
+      channel = Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', normalized_email, normalized_email)
       break if channel.present?
     end
     channel
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index 256a50387..46689ba00 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -3,4 +3,11 @@ module EmailHelper
     domain = email.split('@').last
     domain.split('.').first
   end
+
+  # ref: https://www.rfc-editor.org/rfc/rfc5233.html
+  # This is not a  mandatory requirement for email addresses, but it is a common practice.
+  # john+test@xyc.com is the same as john@xyc.com
+  def normalize_email_with_plus_addressing(email)
+    "#{email.split('@').first.split('+').first}@#{email.split('@').last}".downcase
+  end
 end
diff --git a/spec/finders/email_channel_finder_spec.rb b/spec/finders/email_channel_finder_spec.rb
index 75cae37a9..09f86d19f 100644
--- a/spec/finders/email_channel_finder_spec.rb
+++ b/spec/finders/email_channel_finder_spec.rb
@@ -24,6 +24,13 @@ describe ::EmailChannelFinder do
         channel = described_class.new(reply_mail.mail).perform
         expect(channel).to eq(channel_email)
       end
+
+      it 'return channel with to+extension email' do
+        channel_email.update(email: 'test@example.com')
+        reply_mail.mail['to'] = 'test+123@example.com'
+        channel = described_class.new(reply_mail.mail).perform
+        expect(channel).to eq(channel_email)
+      end
     end
   end
 end
diff --git a/spec/helpers/email_helper_spec.rb b/spec/helpers/email_helper_spec.rb
new file mode 100644
index 000000000..1bc651e91
--- /dev/null
+++ b/spec/helpers/email_helper_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+describe EmailHelper, type: :helper do
+  describe '#normalize_email_with_plus_addressing' do
+    context 'when email is passed' do
+      it 'normalise if plus addressing is present' do
+        expect(helper.normalize_email_with_plus_addressing('john+test@acme.inc')).to eq 'john@acme.inc'
+      end
+
+      it 'returns original if plus addressing is not present' do
+        expect(helper.normalize_email_with_plus_addressing('john@acme.inc')).to eq 'john@acme.inc'
+      end
+
+      it 'returns downcased version of email' do
+        expect(helper.normalize_email_with_plus_addressing('JoHn+AAsdfss@acme.inc')).to eq 'john@acme.inc'
+      end
+    end
+  end
+end

From c8cdff8bc40b847b9ae88b60d3f10ee73448c267 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 1 Mar 2023 18:26:29 +0530
Subject: [PATCH 47/94] feat: Creates component to show contact search results
 (#6571)

* feat: Creates component to show contact search results

* Refactors unused code

* Review fixes

* Update app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../components/SearchResultContactItem.vue    | 83 +++++++++++++++++++
 .../SearchResultContactItem.stories.js        | 53 ++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
 create mode 100644 app/javascript/dashboard/modules/search/stories/SearchResultContactItem.stories.js

diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
new file mode 100644
index 000000000..cbfb35c83
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
@@ -0,0 +1,83 @@
+<template>
+  <router-link :to="navigateTo" class="contact-item">
+    <woot-thumbnail :src="thumbnail" :username="name" size="24px" />
+    <div class="contact-details">
+      <h5 class="text-block-title name">{{ name }}</h5>
+      <p class="details-meta">
+        <span v-if="email" class="email">{{ email }}</span>
+        <span v-if="phone" class="separator">•</span>
+        <span v-if="phone" class="phone">
+          {{ phone }}
+        </span>
+      </p>
+    </div>
+  </router-link>
+</template>
+
+<script>
+import { frontendURL } from 'dashboard/helper/URLHelper';
+export default {
+  props: {
+    id: {
+      type: String,
+      default: '',
+    },
+    email: {
+      type: String,
+      default: '',
+    },
+    phone: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      default: '',
+    },
+    thumbnail: {
+      type: String,
+      default: '',
+    },
+    accountId: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    navigateTo() {
+      return frontendURL(`accounts/${this.accountId}/contacts/${this.id}`);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.contact-item {
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  padding: var(--space-small);
+  border-radius: var(--border-radius-small);
+
+  &:hover {
+    background-color: var(--s-25);
+  }
+}
+.contact-details {
+  margin-left: var(--space-normal);
+}
+.name {
+  margin: 0;
+}
+.details-meta {
+  margin: 0;
+  color: var(--s-600);
+  font-size: var(--font-size-small);
+  display: flex;
+  align-items: center;
+
+  span {
+    margin-right: var(--space-smaller);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/stories/SearchResultContactItem.stories.js b/app/javascript/dashboard/modules/search/stories/SearchResultContactItem.stories.js
new file mode 100644
index 000000000..bb2723057
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/stories/SearchResultContactItem.stories.js
@@ -0,0 +1,53 @@
+import SearchResultContactItem from '../components/SearchResultContactItem.vue';
+
+export default {
+  title: 'Components/Search/SearchResultContactItem',
+  component: SearchResultContactItem,
+  argTypes: {
+    id: {
+      defaultValue: '123',
+      control: {
+        type: 'text',
+      },
+    },
+    name: {
+      defaultValue: 'John Doe',
+      control: {
+        type: 'text',
+      },
+    },
+    email: {
+      defaultValue: 'johndoe@faster.com',
+      control: {
+        type: 'text',
+      },
+    },
+    phone: {
+      defaultValue: '+1 123 456 7890',
+      control: {
+        type: 'text',
+      },
+    },
+    accountId: {
+      defaultValue: '7890',
+      control: {
+        type: 'text',
+      },
+    },
+    thumbnail: {
+      defaultValue: 'https://randomuser.me/api/portraits/men/62.jpg',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { SearchResultContactItem },
+  template:
+    '<search-result-contact-item v-bind="$props"></search-result-contact-item>',
+});
+
+export const ResultContactItem = Template.bind({});

From daf17046e9879d604b61517afa99c548a0f899ac Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 1 Mar 2023 19:11:10 +0530
Subject: [PATCH 48/94] feat: Creates component to display conversation search
 results (#6575)

* feat: Creates component to display conversation search results

* Fixes minor bugs
---
 .../SearchResultConversationItem.vue          | 136 ++++++++++++++++++
 .../SearchResultConversationItem.stories.js   |  50 +++++++
 2 files changed, 186 insertions(+)
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
 create mode 100644 app/javascript/dashboard/modules/search/stories/SearchResultConversationItem.stories.js

diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
new file mode 100644
index 000000000..1b8ec65d2
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
@@ -0,0 +1,136 @@
+<template>
+  <router-link :to="navigateTo" class="conversation-item">
+    <div class="icon-wrap">
+      <fluent-icon icon="chat-multiple" :size="14" />
+    </div>
+    <div class="conversation-details">
+      <div class="meta-wrap">
+        <div class="flex-container ">
+          <woot-label
+            class="conversation-id"
+            :title="`#${id}`"
+            :show-close="false"
+            small
+          />
+          <div class="inbox-name-wrap">
+            <inbox-name :inbox="inbox" class="margin-right-1" />
+          </div>
+        </div>
+        <div>
+          <span>{{ createdAtTime }}</span>
+        </div>
+      </div>
+      <h5 class="text-block-title name">
+        <span class="pre-text">from:</span>
+        {{ name }}
+      </h5>
+      <slot />
+    </div>
+  </router-link>
+</template>
+
+<script>
+import { frontendURL } from 'dashboard/helper/URLHelper.js';
+import timeMixin from 'dashboard/mixins/time';
+import InboxName from 'dashboard/components/widgets/InboxName.vue';
+
+export default {
+  components: {
+    InboxName,
+  },
+  mixins: [timeMixin],
+  props: {
+    id: {
+      type: String,
+      default: '',
+    },
+    email: {
+      type: String,
+      default: '',
+    },
+    inbox: {
+      type: Object,
+      default: () => ({}),
+    },
+    name: {
+      type: String,
+      default: '',
+    },
+    thumbnail: {
+      type: String,
+      default: '',
+    },
+    accountId: {
+      type: String,
+      default: '',
+    },
+    createdAt: {
+      type: [String, Date, Number],
+      default: '',
+    },
+  },
+  computed: {
+    navigateTo() {
+      return frontendURL(`accounts/${this.accountId}/conversations/${this.id}`);
+    },
+    createdAtTime() {
+      return this.dynamicTime(this.createdAt);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.conversation-item {
+  cursor: pointer;
+  display: flex;
+  padding: var(--space-small);
+  border-radius: var(--border-radius-small);
+
+  &:hover {
+    background-color: var(--s-25);
+  }
+}
+
+.meta-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: var(--space-smaller);
+}
+.icon-wrap {
+  width: var(--space-medium);
+  height: var(--space-medium);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--w-600);
+  border-radius: var(--border-radius-small);
+  background-color: var(--w-75);
+}
+
+.inbox-name-wrap {
+  background-color: var(--s-25);
+  height: var(--space-two);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: var(--border-radius-small);
+  width: fit-content;
+  margin-left: var(--space-smaller);
+}
+.conversation-details {
+  margin-left: var(--space-normal);
+  flex-grow: 1;
+}
+.conversation-id,
+.name {
+  margin: 0;
+}
+
+.pre-text {
+  color: var(--s-600);
+  font-size: var(--font-size-mini);
+  font-weight: var(--font-weight-normal);
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/stories/SearchResultConversationItem.stories.js b/app/javascript/dashboard/modules/search/stories/SearchResultConversationItem.stories.js
new file mode 100644
index 000000000..ebfb75e65
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/stories/SearchResultConversationItem.stories.js
@@ -0,0 +1,50 @@
+import SearchResultConversationItem from '../components/SearchResultConversationItem.vue';
+
+export default {
+  title: 'Components/Search/SearchResultConversationItem',
+  component: SearchResultConversationItem,
+  argTypes: {
+    id: {
+      defaultValue: '123',
+      control: {
+        type: 'text',
+      },
+    },
+    name: {
+      defaultValue: 'John Doe',
+      control: {
+        type: 'text',
+      },
+    },
+    inbox: {
+      defaultValue: {
+        name: 'Livechat',
+        channel_type: 'Channel::WebWidget',
+      },
+      control: {
+        type: 'object',
+      },
+    },
+    accountId: {
+      defaultValue: '7890',
+      control: {
+        type: 'text',
+      },
+    },
+    createdAt: {
+      defaultValue: '1677672962',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { SearchResultConversationItem },
+  template:
+    '<search-result-conversation-item v-bind="$props"></search-result-conversation-item>',
+});
+
+export const ResultConversationItem = Template.bind({});

From d870b0815a59b2289b4fc3c91105627a9cdbaf15 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Wed, 1 Mar 2023 20:02:58 +0530
Subject: [PATCH 49/94] feat: Audit log APIs (#6434)

- Adds the appropriate APIs for Audit Logs.

ref: #6015
---
 Gemfile                                       |  2 +
 Gemfile.lock                                  |  3 ++
 app/models/account.rb                         |  1 +
 app/models/automation_rule.rb                 |  2 +
 app/models/inbox.rb                           |  1 +
 app/models/webhook.rb                         |  2 +
 config/initializers/audited.rb                |  5 +++
 config/routes.rb                              |  1 +
 db/migrate/20230202132107_install_audited.rb  | 34 ++++++++++++++
 db/schema.rb                                  | 22 ++++++++++
 .../api/v1/accounts/audit_logs_controller.rb  | 15 +++++++
 .../app/models/enterprise/audit/account.rb    |  7 +++
 .../enterprise/audit/automation_rule.rb       |  7 +++
 .../app/models/enterprise/audit/inbox.rb      |  7 +++
 .../app/models/enterprise/audit/webhook.rb    |  7 +++
 enterprise/app/models/enterprise/audit_log.rb | 11 +++++
 .../v1/accounts/audit_logs_controller_spec.rb | 44 +++++++++++++++++++
 spec/enterprise/models/account_spec.rb        |  7 +++
 .../enterprise/models/automation_rule_spec.rb | 29 ++++++++++++
 spec/enterprise/models/inbox_spec.rb          | 25 ++++++++++-
 spec/enterprise/models/webhook_spec.rb        | 30 +++++++++++++
 21 files changed, 261 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/audited.rb
 create mode 100644 db/migrate/20230202132107_install_audited.rb
 create mode 100644 enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
 create mode 100644 enterprise/app/models/enterprise/audit/account.rb
 create mode 100644 enterprise/app/models/enterprise/audit/automation_rule.rb
 create mode 100644 enterprise/app/models/enterprise/audit/inbox.rb
 create mode 100644 enterprise/app/models/enterprise/audit/webhook.rb
 create mode 100644 enterprise/app/models/enterprise/audit_log.rb
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb
 create mode 100644 spec/enterprise/models/automation_rule_spec.rb
 create mode 100644 spec/enterprise/models/webhook_spec.rb

diff --git a/Gemfile b/Gemfile
index 7aca0710d..a5abc1d90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,6 +205,8 @@ end
 # worked with microsoft refresh token
 gem 'omniauth-oauth2'
 
+gem 'audited', '~> 5.2'
+
 # need for google auth
 gem 'omniauth'
 gem 'omniauth-google-oauth2'
diff --git a/Gemfile.lock b/Gemfile.lock
index e64b6b7b3..2664d64b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,6 +90,8 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
     attr_extras (6.2.5)
+    audited (5.2.0)
+      activerecord (>= 5.0, < 7.1)
     aws-eventstream (1.2.0)
     aws-partitions (1.605.0)
     aws-sdk-core (3.131.2)
@@ -763,6 +765,7 @@ DEPENDENCIES
   administrate
   annotate
   attr_extras
+  audited (~> 5.2)
   aws-sdk-s3
   azure-storage-blob
   barnes
diff --git a/app/models/account.rb b/app/models/account.rb
index 7c7336642..eadd145bf 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -155,3 +155,4 @@ class Account < ApplicationRecord
 end
 
 Account.prepend_mod_with('Account')
+Account.include_mod_with('Audit::Account')
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 8af2a4aab..36f2b833a 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -76,3 +76,5 @@ class AutomationRule < ApplicationRecord
     errors.add(:conditions, 'Automation conditions should have query operator.') if operators.length > 1
   end
 end
+
+AutomationRule.include_mod_with('Audit::Inbox')
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index c015b7835..0c0204da1 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -158,3 +158,4 @@ class Inbox < ApplicationRecord
 end
 
 Inbox.prepend_mod_with('Inbox')
+Inbox.include_mod_with('Audit::Inbox')
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 12d2f0dbf..f43c80548 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -37,3 +37,5 @@ class Webhook < ApplicationRecord
     errors.add(:subscriptions, I18n.t('errors.webhook.invalid')) if invalid_subscriptions
   end
 end
+
+Webhook.include_mod_with('Audit::Inbox')
diff --git a/config/initializers/audited.rb b/config/initializers/audited.rb
new file mode 100644
index 000000000..e6041c7d6
--- /dev/null
+++ b/config/initializers/audited.rb
@@ -0,0 +1,5 @@
+# configuration related audited gem : https://github.com/collectiveidea/audited
+
+Audited.config do |config|
+  config.audit_class = 'Enterprise::AuditLog'
+end
diff --git a/config/routes.rb b/config/routes.rb
index d318d6fa8..3f1a4d9bb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,6 +45,7 @@ Rails.application.routes.draw do
           resources :agents, only: [:index, :create, :update, :destroy]
           resources :agent_bots, only: [:index, :create, :show, :update, :destroy]
           resources :assignable_agents, only: [:index]
+          resource :audit_logs, only: [:show]
           resources :callbacks, only: [] do
             collection do
               post :register_facebook_page
diff --git a/db/migrate/20230202132107_install_audited.rb b/db/migrate/20230202132107_install_audited.rb
new file mode 100644
index 000000000..0bb6da79c
--- /dev/null
+++ b/db/migrate/20230202132107_install_audited.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class InstallAudited < ActiveRecord::Migration[6.1]
+  # rubocop:disable RMetrics/MethodLength
+  def self.up
+    create_table :audits, :force => true do |t|
+      t.bigint :auditable_id
+      t.string :auditable_type
+      t.bigint :associated_id
+      t.string :associated_type
+      t.bigint :user_id
+      t.string :user_type
+      t.string :username
+      t.string :action
+      t.jsonb :audited_changes
+      t.integer :version, :integer, :default => 0
+      t.string :comment
+      t.string :remote_address
+      t.string :request_uuid
+      t.datetime :created_at
+    end
+    # rubocop:enable RMetrics/MethodLength
+
+    add_index :audits, [:auditable_type, :auditable_id, :version], :name => 'auditable_index'
+    add_index :audits, [:associated_type, :associated_id], :name => 'associated_index'
+    add_index :audits, [:user_id, :user_type], :name => 'user_index'
+    add_index :audits, :request_uuid
+    add_index :audits, :created_at
+  end
+
+  def self.down
+    drop_table :audits
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a9b7217ca..d9a209b95 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -153,6 +153,28 @@ ActiveRecord::Schema.define(version: 2023_02_24_124632) do
     t.index ["message_id"], name: "index_attachments_on_message_id"
   end
 
+  create_table 'audits', force: :cascade do |t|
+    t.bigint 'auditable_id'
+    t.string 'auditable_type'
+    t.bigint 'associated_id'
+    t.string 'associated_type'
+    t.bigint 'user_id'
+    t.string 'user_type'
+    t.string 'username'
+    t.string 'action'
+    t.jsonb 'audited_changes'
+    t.integer 'version', default: 0
+    t.string 'comment'
+    t.string 'remote_address'
+    t.string 'request_uuid'
+    t.datetime 'created_at'
+    t.index %w[associated_type associated_id], name: 'associated_index'
+    t.index %w[auditable_type auditable_id version], name: 'auditable_index'
+    t.index ['created_at'], name: 'index_audits_on_created_at'
+    t.index ['request_uuid'], name: 'index_audits_on_request_uuid'
+    t.index %w[user_id user_type], name: 'user_index'
+  end
+
   create_table "automation_rules", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.string "name", null: false
diff --git a/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb b/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
new file mode 100644
index 000000000..02db5156b
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
@@ -0,0 +1,15 @@
+# module Enterprise::Api::V1::Accounts::AuditLogsController < Api::V1::Accounts::BaseController
+class Api::V1::Accounts::AuditLogsController < Api::V1::Accounts::BaseController
+  before_action :check_admin_authorization?
+  before_action :fetch_audit
+
+  def show
+    render json: @audit_logs
+  end
+
+  private
+
+  def fetch_audit
+    @audit_logs = Current.account.associated_audits
+  end
+end
diff --git a/enterprise/app/models/enterprise/audit/account.rb b/enterprise/app/models/enterprise/audit/account.rb
new file mode 100644
index 000000000..c9a1f0f13
--- /dev/null
+++ b/enterprise/app/models/enterprise/audit/account.rb
@@ -0,0 +1,7 @@
+module Enterprise::Audit::Account
+  extend ActiveSupport::Concern
+
+  included do
+    has_associated_audits
+  end
+end
diff --git a/enterprise/app/models/enterprise/audit/automation_rule.rb b/enterprise/app/models/enterprise/audit/automation_rule.rb
new file mode 100644
index 000000000..d40f950bd
--- /dev/null
+++ b/enterprise/app/models/enterprise/audit/automation_rule.rb
@@ -0,0 +1,7 @@
+module Enterprise::Audit::AutomationRule
+  extend ActiveSupport::Concern
+
+  included do
+    audited associated_with: :account
+  end
+end
diff --git a/enterprise/app/models/enterprise/audit/inbox.rb b/enterprise/app/models/enterprise/audit/inbox.rb
new file mode 100644
index 000000000..244e5b60c
--- /dev/null
+++ b/enterprise/app/models/enterprise/audit/inbox.rb
@@ -0,0 +1,7 @@
+module Enterprise::Audit::Inbox
+  extend ActiveSupport::Concern
+
+  included do
+    audited associated_with: :account
+  end
+end
diff --git a/enterprise/app/models/enterprise/audit/webhook.rb b/enterprise/app/models/enterprise/audit/webhook.rb
new file mode 100644
index 000000000..34e0bcc1b
--- /dev/null
+++ b/enterprise/app/models/enterprise/audit/webhook.rb
@@ -0,0 +1,7 @@
+module Enterprise::Audit::Webhook
+  extend ActiveSupport::Concern
+
+  included do
+    audited associated_with: :account
+  end
+end
diff --git a/enterprise/app/models/enterprise/audit_log.rb b/enterprise/app/models/enterprise/audit_log.rb
new file mode 100644
index 000000000..49188110e
--- /dev/null
+++ b/enterprise/app/models/enterprise/audit_log.rb
@@ -0,0 +1,11 @@
+class Enterprise::AuditLog < Audited::Audit
+  after_save :log_additional_information
+
+  private
+
+  def log_additional_information
+    # rubocop:disable Rails/SkipsModelValidations
+    update_columns(username: user&.email)
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb
new file mode 100644
index 000000000..3d7b2e0e4
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb
@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Audit API', type: :request do
+  let!(:account) { create(:account) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:admin) { create(:user, account: account, role: :administrator) }
+
+  describe 'GET /api/v1/accounts/{account.id}/audit_logs' do
+    context 'when it is an un-authenticated user' do
+      it 'does not fetch audit logs associated with the account' do
+        get "/api/v1/accounts/#{account.id}/audit_logs",
+            as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated normal user' do
+      let(:user) { create(:user, account: account) }
+
+      it 'fetches audit logs associated with the account' do
+        get "/api/v1/accounts/#{account.id}/audit_logs",
+            headers: user.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    # check for response in parse
+    context 'when it is an authenticated admin user' do
+      it 'fetches audit logs associated with the account' do
+        get "/api/v1/accounts/#{account.id}/audit_logs",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response[0]['auditable_type']).to eql('Inbox')
+        expect(json_response[0]['action']).to eql('create')
+        expect(json_response[0]['audited_changes']['name']).to eql(inbox.name)
+        expect(json_response[0]['associated_id']).to eql(account.id)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/models/account_spec.rb b/spec/enterprise/models/account_spec.rb
index feb87951b..4c84e3465 100644
--- a/spec/enterprise/models/account_spec.rb
+++ b/spec/enterprise/models/account_spec.rb
@@ -10,6 +10,13 @@ RSpec.describe Account do
 
     let!(:account) { create(:account) }
 
+    describe 'audit logs' do
+      it 'returns audit logs' do
+        # checking whether associated_audits method is present
+        expect(account.associated_audits.present?).to be false
+      end
+    end
+
     it 'returns max limits from global config when enterprise version' do
       expect(account.usage_limits).to eq(
         {
diff --git a/spec/enterprise/models/automation_rule_spec.rb b/spec/enterprise/models/automation_rule_spec.rb
new file mode 100644
index 000000000..69e7949b7
--- /dev/null
+++ b/spec/enterprise/models/automation_rule_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AutomationRule do
+  let!(:automation_rule) { create(:automation_rule, name: 'automation rule 1') }
+
+  describe 'audit log' do
+    context 'when automation rule is created' do
+      it 'has associated audit log created' do
+        expect(Audited::Audit.where(auditable_type: 'AutomationRule', action: 'create').count).to eq 1
+      end
+    end
+
+    context 'when automation rule is updated' do
+      it 'has associated audit log created' do
+        automation_rule.update(name: 'automation rule 2')
+        expect(Audited::Audit.where(auditable_type: 'AutomationRule', action: 'update').count).to eq 1
+      end
+    end
+
+    context 'when automation rule is deleted' do
+      it 'has associated audit log created' do
+        automation_rule.destroy!
+        expect(Audited::Audit.where(auditable_type: 'AutomationRule', action: 'destroy').count).to eq 1
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/models/inbox_spec.rb b/spec/enterprise/models/inbox_spec.rb
index 26dbcef16..259c24b87 100644
--- a/spec/enterprise/models/inbox_spec.rb
+++ b/spec/enterprise/models/inbox_spec.rb
@@ -3,8 +3,9 @@
 require 'rails_helper'
 
 RSpec.describe Inbox do
+  let!(:inbox) { create(:inbox) }
+
   describe 'member_ids_with_assignment_capacity' do
-    let!(:inbox) { create(:inbox) }
     let!(:inbox_member_1) { create(:inbox_member, inbox: inbox) }
     let!(:inbox_member_2) { create(:inbox_member, inbox: inbox) }
     let!(:inbox_member_3) { create(:inbox_member, inbox: inbox) }
@@ -35,4 +36,26 @@ RSpec.describe Inbox do
       expect(inbox.member_ids_with_assignment_capacity).to eq(inbox.members.ids)
     end
   end
+
+  describe 'audit log' do
+    context 'when inbox is created' do
+      it 'has associated audit log created' do
+        expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'create').count).to eq 1
+      end
+    end
+
+    context 'when inbox is updated' do
+      it 'has associated audit log created' do
+        inbox.update(auto_assignment_config: { max_assignment_limit: 2 })
+        expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'update').count).to eq 1
+      end
+    end
+
+    context 'when inbox is deleted' do
+      it 'has associated audit log created' do
+        inbox.destroy!
+        expect(Audited::Audit.where(auditable_type: 'Inbox', action: 'destroy').count).to eq 1
+      end
+    end
+  end
 end
diff --git a/spec/enterprise/models/webhook_spec.rb b/spec/enterprise/models/webhook_spec.rb
new file mode 100644
index 000000000..ac7d23384
--- /dev/null
+++ b/spec/enterprise/models/webhook_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Webhook do
+  let(:account) { create(:account) }
+  let!(:webhook) { create(:webhook, account: account) }
+
+  describe 'audit log' do
+    context 'when webhook is created' do
+      it 'has associated audit log created' do
+        expect(Audited::Audit.where(auditable_type: 'Webhook', action: 'create').count).to eq 1
+      end
+    end
+
+    context 'when webhook is updated' do
+      it 'has associated audit log created' do
+        webhook.update(url: 'https://example.com')
+        expect(Audited::Audit.where(auditable_type: 'Webhook', action: 'update').count).to eq 1
+      end
+    end
+
+    context 'when webhook is deleted' do
+      it 'has associated audit log created' do
+        webhook.destroy!
+        expect(Audited::Audit.where(auditable_type: 'Webhook', action: 'destroy').count).to eq 1
+      end
+    end
+  end
+end

From f1827c82fd0e81153840bc1de61cdb338aa15b81 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 1 Mar 2023 20:24:21 +0530
Subject: [PATCH 50/94] Update contact create swagger (#6576)

---
 swagger/definitions/resource/contact.yml | 50 ++++++++--------
 swagger/swagger.json                     | 72 ++++++++++++++----------
 2 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/swagger/definitions/resource/contact.yml b/swagger/definitions/resource/contact.yml
index 2e72a9834..bbb82e14c 100644
--- a/swagger/definitions/resource/contact.yml
+++ b/swagger/definitions/resource/contact.yml
@@ -1,25 +1,31 @@
 type: object
 properties:
-  email:
-    type: string
-    description: Email address of the contact
-  name:
-    type: string
-    description: The name of the contact
-  phone_number:
-    type: string
-    description: Phone number of the contact
-  thumbnail:
-    type: string
-    description: Avatar URL of the contact
-  additional_attributes:
+  payload:
     type: object
-    description: The object containing additional attributes related to the contact
-  custom_attributes:
-    type: object
-    description: The object to save custom attributes for contact, accepts custom attributes key and value
-    example: { attribute_key: attribute_value, signed_up_at: dd/mm/yyyy }
-  contact_inboxes:
-    type: array
-    items:
-      $ref: '#/definitions/contact_inboxes'
+    properties:
+      contact:
+        type: object
+        properties:
+          email:
+            type: string
+            description: Email address of the contact
+          name:
+            type: string
+            description: The name of the contact
+          phone_number:
+            type: string
+            description: Phone number of the contact
+          thumbnail:
+            type: string
+            description: Avatar URL of the contact
+          additional_attributes:
+            type: object
+            description: The object containing additional attributes related to the contact
+          custom_attributes:
+            type: object
+            description: The object to save custom attributes for contact, accepts custom attributes key and value
+            example: { attribute_key: attribute_value, signed_up_at: dd/mm/yyyy }
+          contact_inboxes:
+            type: array
+            items:
+              $ref: '#/definitions/contact_inboxes'
diff --git a/swagger/swagger.json b/swagger/swagger.json
index a49aa4f96..55b95fb22 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -4857,38 +4857,48 @@
     "contact": {
       "type": "object",
       "properties": {
-        "email": {
-          "type": "string",
-          "description": "Email address of the contact"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the contact"
-        },
-        "phone_number": {
-          "type": "string",
-          "description": "Phone number of the contact"
-        },
-        "thumbnail": {
-          "type": "string",
-          "description": "Avatar URL of the contact"
-        },
-        "additional_attributes": {
+        "payload": {
           "type": "object",
-          "description": "The object containing additional attributes related to the contact"
-        },
-        "custom_attributes": {
-          "type": "object",
-          "description": "The object to save custom attributes for contact, accepts custom attributes key and value",
-          "example": {
-            "attribute_key": "attribute_value",
-            "signed_up_at": "dd/mm/yyyy"
-          }
-        },
-        "contact_inboxes": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/contact_inboxes"
+          "properties": {
+            "contact": {
+              "type": "object",
+              "properties": {
+                "email": {
+                  "type": "string",
+                  "description": "Email address of the contact"
+                },
+                "name": {
+                  "type": "string",
+                  "description": "The name of the contact"
+                },
+                "phone_number": {
+                  "type": "string",
+                  "description": "Phone number of the contact"
+                },
+                "thumbnail": {
+                  "type": "string",
+                  "description": "Avatar URL of the contact"
+                },
+                "additional_attributes": {
+                  "type": "object",
+                  "description": "The object containing additional attributes related to the contact"
+                },
+                "custom_attributes": {
+                  "type": "object",
+                  "description": "The object to save custom attributes for contact, accepts custom attributes key and value",
+                  "example": {
+                    "attribute_key": "attribute_value",
+                    "signed_up_at": "dd/mm/yyyy"
+                  }
+                },
+                "contact_inboxes": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/definitions/contact_inboxes"
+                  }
+                }
+              }
+            }
           }
         }
       }

From 61d0a63bf7042c2febb43a1f9febcee58f77ee6a Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 2 Mar 2023 10:57:14 +0530
Subject: [PATCH 51/94] Fix: product#804: email sender improvement (#6579)

---
 app/mailers/conversation_reply_mailer.rb       | 2 +-
 config/locales/en.yml                          | 2 +-
 spec/mailers/conversation_reply_mailer_spec.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index 5c44d622f..c010fce6d 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -116,7 +116,7 @@ class ConversationReplyMailer < ApplicationMailer
 
   def channel_email_with_name
     if @conversation.assignee.present?
-      I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: assignee_name, from_email: @channel.email)
+      I18n.t('conversations.reply.channel_email.header.reply_with_name', assignee_name: assignee_name, inbox_name: @inbox.name)
     else
       I18n.t('conversations.reply.channel_email.header.reply_with_inbox_name', inbox_name: @inbox.name, from_email: @channel.email)
     end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b2b9ac15..ad1fbc6cf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -149,7 +149,7 @@ en:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index df0e34fd4..a5eb5a6b7 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -171,7 +171,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
 
       it 'renders assignee name in the from address' do
         mail = described_class.email_reply(message)
-        expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from <#{smtp_email_channel.email}>"
+        expect(mail['from'].value).to eq "#{conversation.assignee.available_name} from #{smtp_email_channel.inbox.name}"
       end
 
       it 'renders inbox name in the from address' do

From 9e8eb293e94140bae6b4e63f57a67b147c5d2d18 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 1 Mar 2023 23:32:21 -0800
Subject: [PATCH 52/94] fix: Allow integration apps to be listed by an agent
 (#6587)

* fix: Allow integration apps to be listed by an agent

* Fix rubocop
---
 .../accounts/integrations/apps_controller.rb  |  2 +-
 app/views/api/v1/models/_app.json.jbuilder    | 11 +++++++---
 app/views/api/v1/models/_hook.json.jbuilder   |  3 ++-
 .../integrations/apps_controller_spec.rb      | 21 ++++++++++++++++---
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/v1/accounts/integrations/apps_controller.rb b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
index 7ec5cc5ec..358a15d87 100644
--- a/app/controllers/api/v1/accounts/integrations/apps_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Accounts::Integrations::AppsController < Api::V1::Accounts::BaseController
-  before_action :check_admin_authorization?
+  before_action :check_admin_authorization?, except: [:index, :show]
   before_action :fetch_apps, only: [:index]
   before_action :fetch_app, only: [:show]
 
diff --git a/app/views/api/v1/models/_app.json.jbuilder b/app/views/api/v1/models/_app.json.jbuilder
index 0a05926c4..9933c917a 100644
--- a/app/views/api/v1/models/_app.json.jbuilder
+++ b/app/views/api/v1/models/_app.json.jbuilder
@@ -1,9 +1,14 @@
-json.call(resource.params, *resource.params.keys)
+json.id resource.id
 json.name resource.name
 json.description resource.description
 json.enabled resource.enabled?(@current_account)
-json.action resource.action
-json.button resource.action
+
+if Current.account_user&.administrator?
+  json.call(resource.params, *resource.params.keys)
+  json.action resource.action
+  json.button resource.action
+end
+
 json.hooks do
   json.array! @current_account.hooks.where(app_id: resource.id) do |hook|
     json.partial! 'api/v1/models/hook', formats: [:json], resource: hook
diff --git a/app/views/api/v1/models/_hook.json.jbuilder b/app/views/api/v1/models/_hook.json.jbuilder
index 3c692c13d..271cbbc02 100644
--- a/app/views/api/v1/models/_hook.json.jbuilder
+++ b/app/views/api/v1/models/_hook.json.jbuilder
@@ -4,4 +4,5 @@ json.status resource.enabled?
 json.inbox resource.inbox&.slice(:id, :name)
 json.account_id resource.account_id
 json.hook_type resource.hook_type
-json.settings resource.settings
+
+json.settings resource.settings if Current.account_user&.administrator?
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index 2524ac101..c465e4cd6 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -12,9 +12,10 @@ RSpec.describe 'Integration Apps API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :administrator) }
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:admin) { create(:user, account: account, role: :administrator) }
 
-      it 'returns all active apps' do
+      it 'returns all active apps without sensitive information if the user is an agent' do
         first_app = Integrations::App.all.find(&:active?)
         get api_v1_account_integrations_apps_url(account),
             headers: agent.create_new_auth_token,
@@ -24,12 +25,26 @@ RSpec.describe 'Integration Apps API', type: :request do
         apps = JSON.parse(response.body)['payload'].first
         expect(apps['id']).to eql(first_app.id)
         expect(apps['name']).to eql(first_app.name)
+        expect(apps['action']).to be_nil
+      end
+
+      it 'returns all active apps with sensitive information if user is an admin' do
+        first_app = Integrations::App.all.find(&:active?)
+        get api_v1_account_integrations_apps_url(account),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        apps = JSON.parse(response.body)['payload'].first
+        expect(apps['id']).to eql(first_app.id)
+        expect(apps['name']).to eql(first_app.name)
+        expect(apps['action']).to eql(first_app.action)
       end
 
       it 'returns slack app with appropriate redirect url when configured' do
         with_modified_env SLACK_CLIENT_ID: 'client_id', SLACK_CLIENT_SECRET: 'client_secret' do
           get api_v1_account_integrations_apps_url(account),
-              headers: agent.create_new_auth_token,
+              headers: admin.create_new_auth_token,
               as: :json
 
           expect(response).to have_http_status(:success)

From 89c391e7c06cd98fe1cb16072bb656a0835ab8c8 Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Thu, 2 Mar 2023 08:46:57 +0100
Subject: [PATCH 53/94] fix: Clicking contact name in conversation should open
 contact details panel (#6580)

* chore: support panel trigger on contact name click

Co-authored-by: BikashSah999 <51731962+BikashSah999@users.noreply.github.com>

* Update ConversationHeader.vue

---------

Co-authored-by: BikashSah999 <51731962+BikashSah999@users.noreply.github.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../conversation/ConversationHeader.vue       | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index fddfc3309..c41d2c58e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -10,16 +10,25 @@
           :status="currentContact.availability_status"
         />
         <div class="user--profile__meta">
-          <h3 class="user--name text-truncate">
-            <span class="margin-right-smaller">{{ currentContact.name }}</span>
-            <fluent-icon
-              v-if="!isHMACVerified"
-              v-tooltip="$t('CONVERSATION.UNVERIFIED_SESSION')"
-              size="14"
-              class="hmac-warning__icon"
-              icon="warning"
-            />
-          </h3>
+          <woot-button
+            variant="link"
+            color-scheme="secondary"
+            class="text-truncate"
+            @click.prevent="$emit('contact-panel-toggle')"
+          >
+            <h3 class="sub-block-title user--name text-truncate">
+              <span class="margin-right-smaller">{{
+                currentContact.name
+              }}</span>
+              <fluent-icon
+                v-if="!isHMACVerified"
+                v-tooltip="$t('CONVERSATION.UNVERIFIED_SESSION')"
+                size="14"
+                class="hmac-warning__icon"
+                icon="warning"
+              />
+            </h3>
+          </woot-button>
           <div class="conversation--header--actions text-truncate">
             <inbox-name
               v-if="hasMultipleInboxes"
@@ -201,11 +210,10 @@ export default {
 
 .user--name {
   display: inline-block;
-  font-size: var(--font-size-medium);
-  line-height: 1.3;
-  margin: 0;
+  line-height: 1.2;
   text-transform: capitalize;
-  width: 100%;
+  margin: 0;
+  padding: 0;
 }
 
 .conversation--header--actions {

From b185059681bbb2a7c6364d675a89ab1419466660 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 2 Mar 2023 16:00:16 +0530
Subject: [PATCH 54/94] chore: Handle APM variables being empty (#6594)

- handle the case where the system fails to start when empty APM environment variables are present
---
 config/initializers/datadog.rb | 2 +-
 config/initializers/sentry.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb
index 4072a4c3b..79bc7e580 100644
--- a/config/initializers/datadog.rb
+++ b/config/initializers/datadog.rb
@@ -1,4 +1,4 @@
-if ENV['DD_TRACE_AGENT_URL']
+if ENV['DD_TRACE_AGENT_URL'].present?
   Datadog.configure do |c|
     # Instrumentation
     c.tracing.instrument :rails
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 098f9bdb4..ae21d7f61 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,4 +1,4 @@
-if ENV['SENTRY_DSN']
+if ENV['SENTRY_DSN'].present?
   Sentry.init do |config|
     config.dsn = ENV['SENTRY_DSN']
     config.enabled_environments = %w[staging production]

From a6405ea3390e20696b1c8ca95700c7b28d6cca9c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 2 Mar 2023 19:03:31 +0530
Subject: [PATCH 55/94] fix: migration script to run on all reporting events
 (#6590)

* fix: migration script to run on all reporting events

* fix: don't update user_id if it is already present

* refactor: create a new migration

* feat: update schema

* feat: ignore events with bot handoff

* feat: prefetch conversations with handoff events

* Revert "feat: update schema"

This reverts commit 25ed2856e62655f5f1db14fd0cffad3a69d0b1fb.

* feat: update schema

* refactor: separate method get_conversations_with_bot_handoffs

* refactor: cognitive complexity

* refactor: early return if last_bot_reply is blank

* feat: add async_database_migration queue

* feat: update queue priority
---
 ...t_response_time_in_reporting_events_job.rb | 20 +++++++++-----
 config/sidekiq.yml                            | 27 ++++++++++---------
 ...g_events_with_incorrect_first_responses.rb |  7 +----
 ...te_reporting_events_first_response_time.rb | 10 +++++++
 db/schema.rb                                  |  2 +-
 5 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 db/migrate/20230302054408_update_reporting_events_first_response_time.rb

diff --git a/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb b/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
index 2e658708d..0c43a0e7a 100644
--- a/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
+++ b/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
@@ -2,20 +2,30 @@
 class Migration::UpdateFirstResponseTimeInReportingEventsJob < ApplicationJob
   include ReportingEventHelper
 
-  queue_as :scheduled_jobs
+  queue_as :async_database_migration
 
   def perform(account)
-    account.reporting_events.where(name: 'first_response', user_id: nil).each do |event|
+    get_conversations_with_bot_handoffs(account)
+    account.reporting_events.where(name: 'first_response').each do |event|
       conversation = event.conversation
-      next if conversation.nil?
+
+      # if the conversation has a bot handoff event, we don't need to update the response_time
+      next if conversation.nil? || @conversations_with_handoffs.include?(conversation.id)
 
       update_event_data(event, conversation)
     end
   end
 
+  def get_conversations_with_bot_handoffs(account)
+    @conversations_with_handoffs = account.reporting_events.where(name: 'conversation_bot_handoff').pluck(:conversation_id)
+  end
+
   def update_event_data(event, conversation)
     last_bot_reply = conversation.messages.where(sender_type: 'AgentBot').order(created_at: :asc).last
+    return if last_bot_reply.blank?
+
     first_human_reply = conversation.messages.where(sender_type: 'User').order(created_at: :asc).first
+    return if first_human_reply.blank?
 
     # accomodate for campaign if required
     # new_value = difference between the first_human_reply and the first_bot_reply if it exists or first_human_reply and created at
@@ -32,8 +42,6 @@ class Migration::UpdateFirstResponseTimeInReportingEventsJob < ApplicationJob
     #
     # bot handoff happens at the last_bot_reply created time
     # the response time is the time between last bot reply created and the first human reply created
-
-    return if last_bot_reply.blank? || first_human_reply.blank?
     return if last_bot_reply.created_at.to_i >= first_human_reply.created_at.to_i
 
     # this means a bot replied existed, so we need to update the event_start_time
@@ -47,7 +55,7 @@ class Migration::UpdateFirstResponseTimeInReportingEventsJob < ApplicationJob
                          value: calculate_event_value(last_bot_reply, first_human_reply),
                          value_in_business_hours: calculate_event_value_in_business_hours(inbox, last_bot_reply,
                                                                                           first_human_reply),
-                         user_id: first_human_reply.sender_id)
+                         user_id: event.user_id || first_human_reply.sender_id)
     # rubocop:enable Rails/SkipsModelValidations
   end
 
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 7ebdc064b..c9bf96300 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -12,19 +12,20 @@
 # even put in dynamic logic, like a host-specific queue.
 # http://www.mikeperham.com/2013/11/13/advanced-sidekiq-host-specific-queues/
 :queues:
-  - [low, 1]
-  - [scheduled_jobs, 1]
-  - [webhooks, 1]
-  - [bots, 1]
-  - [active_storage_analysis, 1]
-  - [action_mailbox_incineration, 1]
-  - [active_storage_purge, 1]
-  - [integrations, 2]
-  - [default, 2]
-  - [mailers, 2]
-  - [medium, 3]
-  - [events, 3]
-  - [action_mailbox_routing, 3]
+  - [async_database_migration, 1]
+  - [low, 2]
+  - [scheduled_jobs, 2]
+  - [webhooks, 2]
+  - [bots, 2]
+  - [active_storage_analysis, 2]
+  - [action_mailbox_incineration, 2]
+  - [active_storage_purge, 2]
+  - [integrations, 3]
+  - [default, 3]
+  - [mailers, 3]
+  - [medium, 4]
+  - [events, 4]
+  - [action_mailbox_routing, 4]
   - [high, 5]
   - [critical, 10]
 
diff --git a/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb b/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb
index 437d1f5ba..35dfed168 100644
--- a/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb
+++ b/db/migrate/20230214025901_update_reporting_events_with_incorrect_first_responses.rb
@@ -1,10 +1,5 @@
 class UpdateReportingEventsWithIncorrectFirstResponses < ActiveRecord::Migration[6.1]
   def change
-    ::Account.find_in_batches do |account_batch|
-      Rails.logger.info "Updated reporting events till #{account_batch.first.id}\n"
-      account_batch.each do |account|
-        Migration::UpdateFirstResponseTimeInReportingEventsJob.perform_later(account)
-      end
-    end
+    Rails.logger.info "Skipping this migration, it's replaced by a new one"
   end
 end
diff --git a/db/migrate/20230302054408_update_reporting_events_first_response_time.rb b/db/migrate/20230302054408_update_reporting_events_first_response_time.rb
new file mode 100644
index 000000000..99b9fbc16
--- /dev/null
+++ b/db/migrate/20230302054408_update_reporting_events_first_response_time.rb
@@ -0,0 +1,10 @@
+class UpdateReportingEventsFirstResponseTime < ActiveRecord::Migration[6.1]
+  def change
+    ::Account.find_in_batches do |account_batch|
+      Rails.logger.info "Updated reporting events till #{account_batch.first.id}\n"
+      account_batch.each do |account|
+        Migration::UpdateFirstResponseTimeInReportingEventsJob.perform_later(account)
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d9a209b95..f1c645102 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: 2023_02_24_124632) do
+ActiveRecord::Schema.define(version: 2023_03_02_054408) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"

From a4fc0eef4b70d344b4cf01791571f26f994da91c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 2 Mar 2023 21:33:07 +0530
Subject: [PATCH 56/94] fix: Exception tracking for dialogflow bot service
 (#6593)

---
 lib/integrations/bot_processor_service.rb                | 2 +-
 .../integrations/dialogflow/processor_service_spec.rb    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/integrations/bot_processor_service.rb b/lib/integrations/bot_processor_service.rb
index a76c3706d..c8d220eca 100644
--- a/lib/integrations/bot_processor_service.rb
+++ b/lib/integrations/bot_processor_service.rb
@@ -7,7 +7,7 @@ class Integrations::BotProcessorService
 
     process_content(message)
   rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: agent_bot).capture_exception
+    ChatwootExceptionTracker.new(e, account: hook).capture_exception
   end
 
   private
diff --git a/spec/lib/integrations/dialogflow/processor_service_spec.rb b/spec/lib/integrations/dialogflow/processor_service_spec.rb
index 003fd7c57..835dbc71b 100644
--- a/spec/lib/integrations/dialogflow/processor_service_spec.rb
+++ b/spec/lib/integrations/dialogflow/processor_service_spec.rb
@@ -35,6 +35,15 @@ describe Integrations::Dialogflow::ProcessorService do
       end
     end
 
+    context 'when dilogflow raises exception' do
+      it 'tracks hook into exception tracked' do
+        last_message = conversation.reload.messages.last.content
+        allow(dialogflow_service).to receive(:query_result).and_raise(StandardError)
+        processor.perform
+        expect(conversation.reload.messages.last.content).to eql(last_message)
+      end
+    end
+
     context 'when dialogflow returns fullfillment text to be empty' do
       let(:dialogflow_response) do
         ActiveSupport::HashWithIndifferentAccess.new(

From a685e065da544bdda37dd013a3078da649764d2e Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 2 Mar 2023 22:00:43 +0530
Subject: [PATCH 57/94] fix: Fixes assignee and inbox name spacing issues
 (#6589)

---
 .../dashboard/assets/scss/_rtl.scss           | 10 +++++-----
 .../scss/widgets/_conversation-card.scss      |  4 ++--
 .../dashboard/components/ui/Label.vue         |  8 ++------
 .../widgets/conversation/ConversationCard.vue |  1 +
 .../conversation/ConversationHeader.vue       | 20 +++++++++----------
 .../conversationCardComponents/CardLabels.vue |  2 +-
 6 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 1dd9e7a62..48790f715 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -240,6 +240,11 @@
         }
       }
 
+      .assignee-label {
+        margin-left: 0;
+        margin-right: var(--space-one);
+      }
+
       .show-more--button {
         margin: unset;
         transform: rotate(180deg);
@@ -311,11 +316,6 @@
     }
   }
 
-  // Labels
-  .label {
-    direction: initial;
-  }
-
   // Notification panel
   .notification-wrap {
     left: 0;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
index 858e86b28..e94cee45b 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
@@ -56,7 +56,7 @@
 
   .conversation--user {
     font-size: var(--font-size-small);
-    margin: 0 var(--space-one);
+    margin: 0 var(--space-small);
     text-transform: capitalize;
 
     .label {
@@ -76,7 +76,7 @@
     font-weight: var(--font-weight-normal);
     height: var(--space-medium);
     line-height: var(--space-medium);
-    margin: 0 var(--space-one);
+    margin: 0 var(--space-small);
     max-width: 96%;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/app/javascript/dashboard/components/ui/Label.vue b/app/javascript/dashboard/components/ui/Label.vue
index c41f67180..4b81f5111 100644
--- a/app/javascript/dashboard/components/ui/Label.vue
+++ b/app/javascript/dashboard/components/ui/Label.vue
@@ -12,7 +12,7 @@
     <a v-else :href="href" :style="anchorStyle">{{ title }}</a>
     <button
       v-if="showClose"
-      class="label-close--button "
+      class="label-close--button"
       :style="{ color: textColor }"
       @click="onClick"
     >
@@ -108,6 +108,7 @@ export default {
   display: inline-flex;
   align-items: center;
   font-weight: var(--font-weight-medium);
+  gap: var(--space-smaller);
   margin-right: var(--space-smaller);
   margin-bottom: var(--space-smaller);
   padding: var(--space-smaller);
@@ -126,9 +127,6 @@ export default {
   .label--icon {
     cursor: pointer;
   }
-  .label-color-dot {
-    margin-right: var(--space-smaller);
-  }
 
   &.small .label--icon,
   &.small .close--icon {
@@ -209,7 +207,6 @@ export default {
 .label-close--button {
   color: var(--s-800);
   margin-bottom: var(--space-minus-micro);
-  margin-left: var(--space-smaller);
   border-radius: var(--border-radius-small);
   cursor: pointer;
 
@@ -232,7 +229,6 @@ export default {
   width: var(--space-slab);
   height: var(--space-slab);
   border-radius: var(--border-radius-small);
-  margin-right: var(--space-smaller);
   box-shadow: var(--shadow-small);
 }
 .label.small .label-color-dot {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index ff455c2fe..67cd10a5a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -431,6 +431,7 @@ export default {
 
   .assignee-label {
     display: inline-flex;
+    margin-left: var(--space-small);
     max-width: 50%;
   }
 }
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index c41d2c58e..70493f341 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -17,9 +17,7 @@
             @click.prevent="$emit('contact-panel-toggle')"
           >
             <h3 class="sub-block-title user--name text-truncate">
-              <span class="margin-right-smaller">{{
-                currentContact.name
-              }}</span>
+              <span>{{ currentContact.name }}</span>
               <fluent-icon
                 v-if="!isHMACVerified"
                 v-tooltip="$t('CONVERSATION.UNVERIFIED_SESSION')"
@@ -30,16 +28,12 @@
             </h3>
           </woot-button>
           <div class="conversation--header--actions text-truncate">
-            <inbox-name
-              v-if="hasMultipleInboxes"
-              :inbox="inbox"
-              class="margin-right-1"
-            />
-            <span v-if="isSnoozed" class="snoozed--display-text margin-right-1">
+            <inbox-name v-if="hasMultipleInboxes" :inbox="inbox" />
+            <span v-if="isSnoozed" class="snoozed--display-text">
               {{ snoozedDisplayText }}
             </span>
             <woot-button
-              class="user--profile__button margin-right-1"
+              class="user--profile__button"
               size="small"
               variant="link"
               @click="$emit('contact-panel-toggle')"
@@ -220,6 +214,11 @@ export default {
   align-items: center;
   display: flex;
   font-size: var(--font-size-mini);
+  gap: var(--space-small);
+
+  ::v-deep .inbox--name {
+    margin: 0;
+  }
 
   .user--profile__button {
     padding: 0;
@@ -233,5 +232,6 @@ export default {
 
 .hmac-warning__icon {
   color: var(--y-600);
+  margin: 0 var(--space-micro);
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
index 959ef3c0b..050708056 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
@@ -97,7 +97,7 @@ export default {
 }
 
 .label-container {
-  margin: var(--space-micro) var(--space-one) 0;
+  margin: var(--space-micro) var(--space-small) 0;
 }
 
 .labels-wrap {

From 60fee519bdaf15c8750ce2bb6d4e157ad9c33a22 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 3 Mar 2023 12:14:44 +0530
Subject: [PATCH 58/94] Exception tracker with account (#6603)

---
 app/services/agent_bots/validate_bot_service.rb | 2 +-
 lib/integrations/bot_processor_service.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/agent_bots/validate_bot_service.rb b/app/services/agent_bots/validate_bot_service.rb
index fbb6b446a..d8c0b8a9c 100644
--- a/app/services/agent_bots/validate_bot_service.rb
+++ b/app/services/agent_bots/validate_bot_service.rb
@@ -32,7 +32,7 @@ class AgentBots::ValidateBotService
     response = csml_client.validate(csml_bot_payload)
     response.blank? || response['valid']
   rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: agent_bot).capture_exception
+    ChatwootExceptionTracker.new(e, account: agent_bot&.account).capture_exception
     false
   end
 end
diff --git a/lib/integrations/bot_processor_service.rb b/lib/integrations/bot_processor_service.rb
index c8d220eca..b8a8c4895 100644
--- a/lib/integrations/bot_processor_service.rb
+++ b/lib/integrations/bot_processor_service.rb
@@ -7,7 +7,7 @@ class Integrations::BotProcessorService
 
     process_content(message)
   rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: hook).capture_exception
+    ChatwootExceptionTracker.new(e, account: hook.account).capture_exception
   end
 
   private

From ec04ddc7255a27ec066afed77d401b7f46eb31fd Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 3 Mar 2023 12:26:59 +0530
Subject: [PATCH 59/94] Fallback name branch (#6591)

---
 .../microsoft/callbacks_controller.rb         |  7 ++++++-
 .../microsoft/callbacks_controller_spec.rb    | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/controllers/microsoft/callbacks_controller.rb b/app/controllers/microsoft/callbacks_controller.rb
index 5b765f001..c3ecb8c09 100644
--- a/app/controllers/microsoft/callbacks_controller.rb
+++ b/app/controllers/microsoft/callbacks_controller.rb
@@ -45,13 +45,18 @@ class Microsoft::CallbacksController < ApplicationController
     channel_email.inbox
   end
 
+  # Fallback name, for when name field is missing from users_data
+  def fallback_name
+    users_data['email'].split('@').first.parameterize.titleize
+  end
+
   def create_microsoft_channel_with_inbox
     ActiveRecord::Base.transaction do
       channel_email = Channel::Email.create!(email: users_data['email'], account: account)
       account.inboxes.create!(
         account: account,
         channel: channel_email,
-        name: users_data['name']
+        name: users_data['name'] || fallback_name
       )
       channel_email
     end
diff --git a/spec/controllers/microsoft/callbacks_controller_spec.rb b/spec/controllers/microsoft/callbacks_controller_spec.rb
index 7a647da6c..9579cade0 100644
--- a/spec/controllers/microsoft/callbacks_controller_spec.rb
+++ b/spec/controllers/microsoft/callbacks_controller_spec.rb
@@ -15,6 +15,11 @@ RSpec.describe 'Microsoft::CallbacksController', type: :request do
         refresh_token: SecureRandom.hex(10) }
     end
 
+    let(:response_body_success_without_name) do
+      { id_token: JWT.encode({ email: email }, false), access_token: SecureRandom.hex(10), token_type: 'Bearer',
+        refresh_token: SecureRandom.hex(10) }
+    end
+
     it 'creates inboxes if authentication is successful' do
       stub_request(:post, 'https://login.microsoftonline.com/common/oauth2/v2.0/token')
         .with(body: { 'code' => code, 'grant_type' => 'authorization_code',
@@ -52,6 +57,20 @@ RSpec.describe 'Microsoft::CallbacksController', type: :request do
       expect(Redis::Alfred.get(email)).to be_nil
     end
 
+    it 'creates inboxes with fallback_name when account name is not present in id_token' do
+      stub_request(:post, 'https://login.microsoftonline.com/common/oauth2/v2.0/token')
+        .with(body: { 'code' => code, 'grant_type' => 'authorization_code',
+                      'redirect_uri' => "#{ENV.fetch('FRONTEND_URL', 'http://localhost:3000')}/microsoft/callback" })
+        .to_return(status: 200, body: response_body_success_without_name.to_json, headers: { 'Content-Type' => 'application/json' })
+
+      get microsoft_callback_url, params: { code: code }
+
+      expect(response).to redirect_to app_microsoft_inbox_agents_url(account_id: account.id, inbox_id: account.inboxes.last.id)
+      expect(account.inboxes.count).to be 1
+      inbox = account.inboxes.last
+      expect(inbox.name).to eq email.split('@').first.parameterize.titleize
+    end
+
     it 'redirects to microsoft app in case of error' do
       stub_request(:post, 'https://login.microsoftonline.com/common/oauth2/v2.0/token')
         .with(body: { 'code' => code, 'grant_type' => 'authorization_code',

From 2a385f377c8ffc1e75463a85f80ac678557f4fb2 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 2 Mar 2023 23:56:54 -0800
Subject: [PATCH 60/94] chore: Use markdown-it instead of marked (#6123)

* chore: Use markdown-it instead of marked

* Adds styling for markdown rendered content

* fixes codeclimate issue

* Fixes blockquote styles for widget in darkmode

* fix: issue block quote color issue in light mode

* fix: issue block quote color issue in light mode

* Fixes blockquote color in dark mode

* Remove usage of dark mode mixin in user bubble

* chore: code clean up

---------

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin <iamsivin@gmail.com>
---
 .../scss/widgets/_conversation-view.scss      | 21 +-----
 .../widgets/conversation/Message.vue          | 75 ++++++++++++++++++-
 .../widgets/conversation/bubble/Text.vue      | 20 ++++-
 .../shared/helpers/MessageFormatter.js        | 62 +++++++--------
 .../shared/helpers/markdownIt/link.js         | 69 +++++++++++++++++
 .../helpers/specs/MessageFormatter.spec.js    | 14 ++--
 .../widget/assets/scss/_variables.scss        | 15 +++-
 .../assets/scss/views/_conversation.scss      | 26 +++----
 .../widget/components/AgentMessageBubble.vue  | 13 +---
 .../widget/components/ChatMessage.vue         | 53 +++++++++++++
 .../widget/components/UserMessageBubble.vue   | 31 ++++++--
 package.json                                  |  3 +-
 yarn.lock                                     | 36 ++++++++-
 13 files changed, 332 insertions(+), 106 deletions(-)
 create mode 100644 app/javascript/shared/helpers/markdownIt/link.js

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index dc75ee29d..97adeed4c 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -380,14 +380,6 @@
     text-decoration: underline;
   }
 
-  blockquote {
-    border-left-color: var(--s-300);
-
-    p {
-      color: var(--s-300);
-    }
-  }
-
   p:last-child {
     margin-bottom: 0;
   }
@@ -408,19 +400,8 @@
     text-decoration: underline;
   }
 
-  blockquote {
-    border-left-color: var(--w-100);
-
-    p {
-      color: var(--w-100);
-    }
-  }
-
-  pre code {
-    background: var(--color-background);
-  }
-
   p:last-child {
     margin-bottom: 0;
   }
 }
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index b4179b696..f8d50bfca 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -243,14 +243,14 @@ export default {
       return this.contentAttributes.translations || {};
     },
     displayQuotedButton() {
-      if (!this.isIncoming) {
-        return false;
-      }
-
       if (this.emailMessageContent.includes('<blockquote')) {
         return true;
       }
 
+      if (!this.isIncoming) {
+        return false;
+      }
+
       return false;
     },
     translationsAvailable() {
@@ -660,4 +660,71 @@ li.right {
 .context-menu {
   position: relative;
 }
+
+/* Markdown styling */
+
+.bubble .text-content {
+  p code {
+    background-color: var(--s-75);
+    display: inline-block;
+    line-height: 1;
+
+    border-radius: var(--border-radius-small);
+    padding: var(--space-smaller);
+  }
+
+  pre {
+    background-color: var(--s-75);
+    border-color: var(--s-75);
+    color: var(--s-800);
+    border-radius: var(--border-radius-normal);
+    padding: var(--space-small);
+    margin-top: var(--space-smaller);
+    margin-bottom: var(--space-small);
+    display: block;
+    line-height: 1.7;
+    white-space: pre-wrap;
+
+    code {
+      background-color: transparent;
+      color: var(--s-800);
+      padding: 0;
+    }
+  }
+
+  blockquote {
+    border-left: var(--space-micro) solid var(--s-75);
+    color: var(--s-800);
+    padding: var(--space-smaller) var(--space-small);
+    margin: var(--space-smaller) 0;
+    padding: var(--space-small) var(--space-small) 0 var(--space-normal);
+  }
+}
+
+.right .bubble .text-content {
+  p code {
+    background-color: var(--w-600);
+    color: var(--white);
+  }
+
+  pre {
+    background-color: var(--w-800);
+    border-color: var(--w-700);
+    color: var(--white);
+
+    code {
+      background-color: transparent;
+      color: var(--white);
+    }
+  }
+
+  blockquote {
+    border-left: var(--space-micro) solid var(--w-400);
+    color: var(--white);
+
+    p {
+      color: var(--w-75);
+    }
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
index e5294db99..d69abf626 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
@@ -2,14 +2,14 @@
   <div
     class="message-text__wrap"
     :class="{
-      'show--quoted': showQuotedContent,
-      'hide--quoted': !showQuotedContent,
+      'show--quoted': isQuotedContentPresent,
+      'hide--quoted': !isQuotedContentPresent,
     }"
   >
     <div v-if="!isEmail" v-dompurify-html="message" class="text-content" />
     <letter v-else class="text-content" :html="message" />
     <button
-      v-if="displayQuotedButton"
+      v-if="showQuoteToggle"
       class="quoted-text--button"
       @click="toggleQuotedContent"
     >
@@ -49,6 +49,20 @@ export default {
       showQuotedContent: false,
     };
   },
+  computed: {
+    isQuotedContentPresent() {
+      if (!this.isEmail) {
+        return this.message.includes('<blockquote');
+      }
+      return this.showQuotedContent;
+    },
+    showQuoteToggle() {
+      if (!this.isEmail) {
+        return false;
+      }
+      return this.displayQuotedButton;
+    },
+  },
   methods: {
     toggleQuotedContent() {
       this.showQuotedContent = !this.showQuotedContent;
diff --git a/app/javascript/shared/helpers/MessageFormatter.js b/app/javascript/shared/helpers/MessageFormatter.js
index c4d0bb62e..59e1173ac 100644
--- a/app/javascript/shared/helpers/MessageFormatter.js
+++ b/app/javascript/shared/helpers/MessageFormatter.js
@@ -1,57 +1,49 @@
-import { marked } from 'marked';
-import DOMPurify from 'dompurify';
-import { escapeHtml, afterSanitizeAttributes } from './HTMLSanitizer';
+import mila from 'markdown-it-link-attributes';
+import mentionPlugin from './markdownIt/link';
+const md = require('markdown-it')({
+  html: false,
+  xhtmlOut: true,
+  breaks: true,
+  langPrefix: 'language-',
+  linkify: true,
+  typographer: true,
+  quotes: '\u201c\u201d\u2018\u2019',
+  maxNesting: 20,
+})
+  .use(mentionPlugin)
+  .use(mila, {
+    attrs: {
+      class: 'link',
+      rel: 'noreferrer noopener nofollow',
+      target: '_blank',
+    },
+  });
 
 const TWITTER_USERNAME_REGEX = /(^|[^@\w])@(\w{1,15})\b/g;
-const TWITTER_USERNAME_REPLACEMENT =
-  '$1<a href="http://twitter.com/$2" target="_blank" rel="noreferrer nofollow noopener">@$2</a>';
-
+const TWITTER_USERNAME_REPLACEMENT = '$1[@$2](http://twitter.com/$2)';
 const TWITTER_HASH_REGEX = /(^|\s)#(\w+)/g;
-const TWITTER_HASH_REPLACEMENT =
-  '$1<a href="https://twitter.com/hashtag/$2" target="_blank" rel="noreferrer nofollow noopener">#$2</a>';
-
-const USER_MENTIONS_REGEX = /mention:\/\/(user|team)\/(\d+)\/(.+)/gm;
+const TWITTER_HASH_REPLACEMENT = '$1[#$2](https://twitter.com/hashtag/$2)';
 
 class MessageFormatter {
   constructor(message, isATweet = false, isAPrivateNote = false) {
-    this.message = DOMPurify.sanitize(escapeHtml(message || ''));
+    this.message = message || '';
     this.isAPrivateNote = isAPrivateNote;
     this.isATweet = isATweet;
-    this.marked = marked;
-
-    const renderer = {
-      heading(text) {
-        return `<strong>${text}</strong>`;
-      },
-      link(url, title, text) {
-        const mentionRegex = new RegExp(USER_MENTIONS_REGEX);
-        if (url.match(mentionRegex)) {
-          return `<span class="prosemirror-mention-node">${text}</span>`;
-        }
-        return `<a rel="noreferrer noopener nofollow" href="${url}" class="link" title="${title ||
-          ''}" target="_blank">${text}</a>`;
-      },
-    };
-    this.marked.use({ renderer });
   }
 
   formatMessage() {
+    let updatedMessage = this.message;
     if (this.isATweet && !this.isAPrivateNote) {
-      const withUserName = this.message.replace(
+      updatedMessage = updatedMessage.replace(
         TWITTER_USERNAME_REGEX,
         TWITTER_USERNAME_REPLACEMENT
       );
-      const withHash = withUserName.replace(
+      updatedMessage = updatedMessage.replace(
         TWITTER_HASH_REGEX,
         TWITTER_HASH_REPLACEMENT
       );
-      const markedDownOutput = marked(withHash);
-      return markedDownOutput;
     }
-    DOMPurify.addHook('afterSanitizeAttributes', afterSanitizeAttributes);
-    return DOMPurify.sanitize(
-      marked(this.message, { breaks: true, gfm: true })
-    );
+    return md.render(updatedMessage);
   }
 
   get formattedMessage() {
diff --git a/app/javascript/shared/helpers/markdownIt/link.js b/app/javascript/shared/helpers/markdownIt/link.js
new file mode 100644
index 000000000..c5300391b
--- /dev/null
+++ b/app/javascript/shared/helpers/markdownIt/link.js
@@ -0,0 +1,69 @@
+// Process [@mention](mention://user/1/Pranav)
+const USER_MENTIONS_REGEX = /mention:\/\/(user|team)\/(\d+)\/(.+)/gm;
+
+const buildMentionTokens = () => (state, silent) => {
+  var label;
+  var labelEnd;
+  var labelStart;
+  var pos;
+  var res;
+  var token;
+  var href = '';
+  var max = state.posMax;
+
+  if (state.src.charCodeAt(state.pos) !== 0x5b /* [ */) {
+    return false;
+  }
+
+  labelStart = state.pos + 1;
+  labelEnd = state.md.helpers.parseLinkLabel(state, state.pos, true);
+
+  // parser failed to find ']', so it's not a valid link
+  if (labelEnd < 0) {
+    return false;
+  }
+
+  label = state.src.slice(labelStart, labelEnd);
+  pos = labelEnd + 1;
+
+  if (pos < max && state.src.charCodeAt(pos) === 0x28 /* ( */) {
+    pos += 1;
+    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
+    if (res.ok) {
+      href = state.md.normalizeLink(res.str);
+      if (state.md.validateLink(href)) {
+        pos = res.pos;
+      } else {
+        href = '';
+      }
+    }
+    pos += 1;
+  }
+
+  if (!href.match(new RegExp(USER_MENTIONS_REGEX))) {
+    return false;
+  }
+
+  if (!silent) {
+    state.pos = labelStart;
+    state.posMax = labelEnd;
+
+    token = state.push('mention', '');
+    token.href = href;
+    token.content = label;
+  }
+
+  state.pos = pos;
+  state.posMax = max;
+
+  return true;
+};
+
+const renderMentions = () => (tokens, idx) => {
+  return `<span class="prosemirror-mention-node">${tokens[idx].content}</span>`;
+};
+
+export default function mentionPlugin(md) {
+  md.renderer.rules.mention = renderMentions(md);
+  md.inline.ruler.before('link', 'mention', buildMentionTokens(md));
+}
diff --git a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
index 1f2209b71..60c875c8a 100644
--- a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
+++ b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
@@ -6,14 +6,14 @@ describe('#MessageFormatter', () => {
       const message =
         'Chatwoot is an opensource tool. [Chatwoot](https://www.chatwoot.com)';
       expect(new MessageFormatter(message).formattedMessage).toMatch(
-        '<p>Chatwoot is an opensource tool. <a title="" class="link" href="https://www.chatwoot.com" rel="noreferrer noopener nofollow" target="_blank">Chatwoot</a></p>'
+        '<p>Chatwoot is an opensource tool. <a href="https://www.chatwoot.com" class="link" rel="noreferrer noopener nofollow" target="_blank">Chatwoot</a></p>'
       );
     });
     it('should format correctly', () => {
       const message =
         'Chatwoot is an opensource tool. https://www.chatwoot.com';
       expect(new MessageFormatter(message).formattedMessage).toMatch(
-        '<p>Chatwoot is an opensource tool. <a title="" class="link" href="https://www.chatwoot.com" rel="noreferrer noopener nofollow" target="_blank">https://www.chatwoot.com</a></p>'
+        '<p>Chatwoot is an opensource tool. <a href="https://www.chatwoot.com" class="link" rel="noreferrer noopener nofollow" target="_blank">https://www.chatwoot.com</a></p>'
       );
     });
   });
@@ -22,7 +22,8 @@ describe('#MessageFormatter', () => {
     it('should format correctly', () => {
       const message = '### opensource \n ## tool';
       expect(new MessageFormatter(message).formattedMessage).toMatch(
-        '<strong>opensource</strong><strong>tool</strong>'
+        `<h3>opensource</h3>
+<h2>tool</h2>`
       );
     });
   });
@@ -39,7 +40,7 @@ describe('#MessageFormatter', () => {
       expect(
         new MessageFormatter(message, true, false).formattedMessage
       ).toMatch(
-        '<p><a href="http://twitter.com/chatwootapp" target="_blank" rel="noreferrer nofollow noopener">@chatwootapp</a> is an opensource tool thanks @longnonexistenttwitterusername</p>'
+        '<p><a href="http://twitter.com/chatwootapp" class="link" rel="noreferrer noopener nofollow" target="_blank">@chatwootapp</a> is an opensource tool thanks @longnonexistenttwitterusername</p>'
       );
     });
 
@@ -48,7 +49,7 @@ describe('#MessageFormatter', () => {
       expect(
         new MessageFormatter(message, true, false).formattedMessage
       ).toMatch(
-        '<p><a href="https://twitter.com/hashtag/chatwootapp" target="_blank" rel="noreferrer nofollow noopener">#chatwootapp</a> is an opensource tool</p>'
+        '<p><a href="https://twitter.com/hashtag/chatwootapp" class="link" rel="noreferrer noopener nofollow" target="_blank">#chatwootapp</a> is an opensource tool</p>'
       );
     });
   });
@@ -90,7 +91,8 @@ describe('#MessageFormatter', () => {
       const message =
         '[xssLink](javascript:alert(document.cookie))\n[normalLink](https://google.com)**I am a bold text paragraph**';
       expect(new MessageFormatter(message).formattedMessage).toMatch(
-        '<p><a title="" class="link" rel="noreferrer noopener nofollow" target="_blank">xssLink</a><br><a title="" class="link" href="https://google.com" rel="noreferrer noopener nofollow" target="_blank">normalLink</a><strong>I am a bold text paragraph</strong></p>'
+        `<p>[xssLink](javascript:alert(document.cookie))<br />
+<a href="https://google.com" class="link" rel="noreferrer noopener nofollow" target="_blank">normalLink</a><strong>I am a bold text paragraph</strong></p>`
       );
     });
   });
diff --git a/app/javascript/widget/assets/scss/_variables.scss b/app/javascript/widget/assets/scss/_variables.scss
index d3cf6cc1c..73c4fce1b 100755
--- a/app/javascript/widget/assets/scss/_variables.scss
+++ b/app/javascript/widget/assets/scss/_variables.scss
@@ -26,6 +26,9 @@ $space-big: 4rem;
 $space-jumbo: 5rem;
 $space-mega: 6.25rem;
 
+$border-radius-small: 0.1875rem;
+$border-radius-normal: 0.3125rem;
+
 // font-weight
 $font-weight-feather: 100;
 $font-weight-light: 300;
@@ -74,8 +77,16 @@ $line-height: 1;
 $footer-height: 11.2rem;
 $header-expanded-height: $space-medium * 10;
 
-$font-family: 'Inter', -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI',
-  Roboto, 'Helvetica Neue', Tahoma, Arial, sans-serif;
+$font-family: 'Inter',
+-apple-system,
+system-ui,
+BlinkMacSystemFont,
+'Segoe UI',
+Roboto,
+'Helvetica Neue',
+Tahoma,
+Arial,
+sans-serif;
 
 // Break points
 $break-point-medium: 667px;
diff --git a/app/javascript/widget/assets/scss/views/_conversation.scss b/app/javascript/widget/assets/scss/views/_conversation.scss
index 7124c52fb..24f4701fc 100644
--- a/app/javascript/widget/assets/scss/views/_conversation.scss
+++ b/app/javascript/widget/assets/scss/views/_conversation.scss
@@ -1,4 +1,4 @@
-.file-uploads .attachment-button+label {
+.file-uploads .attachment-button + label {
   cursor: pointer;
 }
 
@@ -61,7 +61,7 @@
   }
 
   .agent-message-wrap {
-    +.agent-message-wrap {
+    + .agent-message-wrap {
       margin-top: $space-micro;
 
       .agent-message .chat-bubble {
@@ -69,11 +69,11 @@
       }
     }
 
-    +.user-message-wrap {
+    + .user-message-wrap {
       margin-top: $space-normal;
     }
 
-    &.has-response+.user-message-wrap {
+    &.has-response + .user-message-wrap {
       margin-top: $space-micro;
 
       .chat-bubble {
@@ -81,7 +81,7 @@
       }
     }
 
-    &.has-response+.agent-message-wrap {
+    &.has-response + .agent-message-wrap {
       margin-top: $space-normal;
     }
   }
@@ -117,7 +117,6 @@
     }
   }
 
-
   .user.has-attachment {
     .icon-wrap {
       color: $color-white;
@@ -129,7 +128,7 @@
   }
 
   .user-message-wrap {
-    +.user-message-wrap {
+    + .user-message-wrap {
       margin-top: $space-micro;
 
       .user-message .chat-bubble {
@@ -137,7 +136,7 @@
       }
     }
 
-    +.agent-message-wrap {
+    + .agent-message-wrap {
       margin-top: $space-normal;
     }
   }
@@ -147,7 +146,6 @@
   }
 }
 
-
 .unread-messages {
   display: flex;
   flex-direction: column;
@@ -168,7 +166,7 @@
       border: 1px solid $color-border-dark;
     }
 
-    +.chat-bubble-wrap {
+    + .chat-bubble-wrap {
       .chat-bubble {
         border-top-left-radius: $space-smaller;
       }
@@ -190,7 +188,7 @@
       border-radius: $space-two;
     }
 
-    +.chat-bubble-wrap {
+    + .chat-bubble-wrap {
       .chat-bubble {
         border-top-right-radius: $space-smaller;
       }
@@ -206,7 +204,6 @@
   }
 }
 
-
 .chat-bubble {
   @include light-shadow;
   border-radius: $space-two;
@@ -214,6 +211,7 @@
   display: inline-block;
   font-size: $font-size-default;
   line-height: 1.5;
+  max-width: 100%;
   padding: $space-slab $space-normal;
   text-align: left;
   word-break: break-word;
@@ -222,7 +220,7 @@
     max-width: 100%;
   }
 
-  >a {
+  > a {
     color: $color-primary;
     word-break: break-all;
   }
@@ -234,7 +232,7 @@
   &.user {
     border-bottom-right-radius: $space-smaller;
 
-    >a {
+    > a {
       color: $color-white;
     }
   }
diff --git a/app/javascript/widget/components/AgentMessageBubble.vue b/app/javascript/widget/components/AgentMessageBubble.vue
index 01fbe6faa..04b0808e5 100755
--- a/app/javascript/widget/components/AgentMessageBubble.vue
+++ b/app/javascript/widget/components/AgentMessageBubble.vue
@@ -5,7 +5,7 @@
         !isCards && !isOptions && !isForm && !isArticle && !isCards && !isCSAT
       "
       class="chat-bubble agent"
-      :class="$dm('bg-white', 'dark:bg-slate-700')"
+      :class="$dm('bg-white', 'dark:bg-slate-700 has-dark-mode')"
     >
       <div
         v-dompurify-html="formatMessage(message, false)"
@@ -142,14 +142,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-@import '~widget/assets/scss/variables.scss';
-
-.chat-bubble .message-content::v-deep pre {
-  background: $color-primary-light;
-  color: $color-body;
-  overflow-y: auto;
-  padding: $space-smaller;
-}
-</style>
diff --git a/app/javascript/widget/components/ChatMessage.vue b/app/javascript/widget/components/ChatMessage.vue
index b63525242..b70c3b2c2 100755
--- a/app/javascript/widget/components/ChatMessage.vue
+++ b/app/javascript/widget/components/ChatMessage.vue
@@ -35,3 +35,56 @@ export default {
   max-width: 90%;
 }
 </style>
+
+<style lang="scss">
+@import '~widget/assets/scss/variables.scss';
+
+.chat-bubble .message-content,
+.chat-bubble.user {
+  p code {
+    background-color: var(--s-75);
+    display: inline-block;
+    line-height: 1;
+
+    border-radius: $border-radius-small;
+    padding: $space-smaller;
+  }
+
+  pre {
+    overflow-y: auto;
+    background-color: var(--s-75);
+    border-color: var(--s-75);
+    color: var(--s-800);
+    border-radius: $border-radius-normal;
+    padding: $space-small;
+    margin-top: $space-smaller;
+    margin-bottom: $space-small;
+    display: block;
+    line-height: 1.7;
+    white-space: pre-wrap;
+
+    code {
+      background-color: transparent;
+      color: var(--s-800);
+      padding: 0;
+    }
+  }
+
+  blockquote {
+    border-left: $space-micro solid var(--s-75);
+    color: var(--s-800);
+    padding: $space-smaller $space-small;
+    margin: $space-smaller 0;
+    padding: $space-small $space-small 0 $space-normal;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  .chat-bubble.agent.has-dark-mode {
+    blockquote {
+      border-color: var(--s-200);
+      color: var(--s-50);
+    }
+  }
+}
+</style>
diff --git a/app/javascript/widget/components/UserMessageBubble.vue b/app/javascript/widget/components/UserMessageBubble.vue
index 50bc99a3b..eed90865f 100755
--- a/app/javascript/widget/components/UserMessageBubble.vue
+++ b/app/javascript/widget/components/UserMessageBubble.vue
@@ -38,10 +38,31 @@ export default {
 <style lang="scss" scoped>
 @import '~widget/assets/scss/variables.scss';
 
-.chat-bubble.user::v-deep pre {
-  background: $color-primary-light;
-  color: $color-body;
-  overflow: auto;
-  padding: $space-smaller;
+.chat-bubble.user::v-deep {
+  p code {
+    background-color: var(--w-600);
+    color: var(--white);
+  }
+
+  pre {
+    background-color: var(--w-800);
+    border-color: var(--w-700);
+    color: var(--white);
+
+    code {
+      background-color: transparent;
+      color: var(--white);
+    }
+  }
+
+  blockquote {
+    border-left: $space-micro solid var(--w-400);
+    background: var(--s-25);
+    border-color: var(--s-200);
+
+    p {
+      color: var(--s-800);
+    }
+  }
 }
 </style>
diff --git a/package.json b/package.json
index 62d2c63da..8b1ce3b45 100644
--- a/package.json
+++ b/package.json
@@ -43,9 +43,10 @@
     "highlight.js": "~10.4.1",
     "ionicons": "~2.0.1",
     "js-cookie": "^2.2.1",
+    "markdown-it": "^13.0.1",
+    "markdown-it-link-attributes": "^4.0.1",
     "logrocket": "^3.0.1",
     "logrocket-vuex": "^0.0.3",
-    "marked": "4.0.10",
     "md5": "^2.3.0",
     "ninja-keys": "^1.1.9",
     "opus-recorder": "^8.0.5",
diff --git a/yarn.lock b/yarn.lock
index 2f78d9446..d31a238c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4823,6 +4823,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -7491,6 +7496,11 @@ entities@~2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
+entities@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -10927,6 +10937,13 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
+linkify-it@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
+  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
+  dependencies:
+    uc.micro "^1.0.1"
+
 lint-staged@10.5.4:
   version "10.5.4"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665"
@@ -11337,6 +11354,11 @@ markdown-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
   integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
+markdown-it-link-attributes@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz#25751f2cf74fd91f0a35ba7b3247fa45f2056d88"
+  integrity sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==
+
 markdown-it@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
@@ -11348,10 +11370,16 @@ markdown-it@^10.0.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-marked@4.0.10:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.10.tgz#423e295385cc0c3a70fa495e0df68b007b879423"
-  integrity sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==
+markdown-it@^13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
+  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~3.0.1"
+    linkify-it "^4.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
 
 material-colors@^1.0.0:
   version "1.2.6"

From 88ed028a06c04e77f5a9331fda30ee6b7cf58940 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 3 Mar 2023 20:58:21 +0530
Subject: [PATCH 61/94] feat: Revamps search to use new search API's (#6582)

* feat: Revamps search to use new search API's

* Fixes search result spacing

* Fixes message result

* Fixes issue with empty search results

* Remove console errors

* Remove console errors

* Fix console errors, canned responses

* Fixes message rendering on results

* Highlights search term

* Fixes html rendering for emails

* FIxes email rendering issues

* Removes extra spaces and line breaks

---------

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/javascript/dashboard/api/search.js        |  18 ++
 .../components/widgets/InboxName.vue          |   2 +-
 .../widgets/conversation/ReplyBox.vue         |   5 +
 .../helper/AnalyticsHelper/events.js          |   2 +-
 .../dashboard/i18n/locale/en/index.js         |   2 +
 .../dashboard/i18n/locale/en/search.json      |  22 ++
 .../search/components/MessageContent.vue      | 110 ++++++++++
 .../modules/search/components/ReadMore.vue    |  56 +++++
 .../search/components/SearchHeader.vue        |  98 +++++++++
 .../components/SearchResultContactItem.vue    |   8 +-
 .../components/SearchResultContactsList.vue   |  49 +++++
 .../SearchResultConversationItem.vue          |  22 +-
 .../SearchResultConversationsList.vue         |  47 ++++
 .../components/SearchResultMessagesList.vue   |  61 ++++++
 .../search/components/SearchResultSection.vue |  70 ++++++
 .../modules/search/components/SearchTabs.vue  |  40 ++++
 .../modules/search/components/SearchView.vue  | 202 ++++++++++++++++++
 .../dashboard/modules/search/search.routes.js |  12 ++
 .../search/stories/MessageContent.stories.js  |  28 +++
 .../conversation/search/PopOverSearch.vue     | 142 +++---------
 .../routes/dashboard/dashboard.routes.js      |   2 +
 .../store/modules/conversationSearch.js       |  33 ++-
 .../dashboard/store/mutation-types.js         |   3 +
 .../v1/accounts/search/_message.json.jbuilder |   4 +-
 24 files changed, 896 insertions(+), 142 deletions(-)
 create mode 100644 app/javascript/dashboard/api/search.js
 create mode 100644 app/javascript/dashboard/i18n/locale/en/search.json
 create mode 100644 app/javascript/dashboard/modules/search/components/MessageContent.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/ReadMore.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchHeader.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchResultSection.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchTabs.vue
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchView.vue
 create mode 100644 app/javascript/dashboard/modules/search/search.routes.js
 create mode 100644 app/javascript/dashboard/modules/search/stories/MessageContent.stories.js

diff --git a/app/javascript/dashboard/api/search.js b/app/javascript/dashboard/api/search.js
new file mode 100644
index 000000000..2e4c3b198
--- /dev/null
+++ b/app/javascript/dashboard/api/search.js
@@ -0,0 +1,18 @@
+/* global axios */
+import ApiClient from './ApiClient';
+
+class SearchAPI extends ApiClient {
+  constructor() {
+    super('search', { accountScoped: true });
+  }
+
+  get({ q }) {
+    return axios.get(this.url, {
+      params: {
+        q,
+      },
+    });
+  }
+}
+
+export default new SearchAPI();
diff --git a/app/javascript/dashboard/components/widgets/InboxName.vue b/app/javascript/dashboard/components/widgets/InboxName.vue
index feb71803c..427772cf5 100644
--- a/app/javascript/dashboard/components/widgets/InboxName.vue
+++ b/app/javascript/dashboard/components/widgets/InboxName.vue
@@ -31,7 +31,7 @@ export default {
   line-height: var(--space-slab);
   font-weight: var(--font-weight-medium);
   background: none;
-  color: var(--s-500);
+  color: var(--s-600);
   font-size: var(--font-size-mini);
   margin: 0 var(--space-one);
 }
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 86cf292b9..7baa50cf5 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -887,6 +887,11 @@ export default {
     toggleTyping(status) {
       const conversationId = this.currentChat.id;
       const isPrivate = this.isPrivate;
+
+      if (!conversationId) {
+        return;
+      }
+
       this.$store.dispatch('conversationTypingStatus/toggleTyping', {
         status,
         conversationId,
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index b55b5f2c2..0ffccd668 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -5,7 +5,7 @@ export const CONVERSATION_EVENTS = Object.freeze({
   INSERTED_A_CANNED_RESPONSE: 'Inserted a canned response',
   INSERTED_A_VARIABLE: 'Inserted a variable',
   USED_MENTIONS: 'Used mentions',
-
+  SEARCH_CONVERSATION: 'Searched conversations',
   APPLY_FILTER: 'Applied filters in the conversation list',
 });
 
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 0c674eef2..387241f31 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -22,6 +22,7 @@ import login from './login.json';
 import macros from './macros.json';
 import report from './report.json';
 import resetPassword from './resetPassword.json';
+import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
@@ -53,6 +54,7 @@ export default {
   ...macros,
   ...report,
   ...resetPassword,
+  ...search,
   ...setNewPassword,
   ...settings,
   ...signup,
diff --git a/app/javascript/dashboard/i18n/locale/en/search.json b/app/javascript/dashboard/i18n/locale/en/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/modules/search/components/MessageContent.vue b/app/javascript/dashboard/modules/search/components/MessageContent.vue
new file mode 100644
index 000000000..f0aacb91e
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/MessageContent.vue
@@ -0,0 +1,110 @@
+<template>
+  <blockquote ref="messageContainer" class="message">
+    <p class="header">
+      <strong class="author">
+        {{ author }}
+      </strong>
+      {{ $t('SEARCH.WROTE') }}
+    </p>
+    <read-more :shrink="isOverflowing" @expand="isOverflowing = false">
+      <div v-dompurify-html="prepareContent(content)" class="message-content" />
+    </read-more>
+  </blockquote>
+</template>
+
+<script>
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+import ReadMore from './ReadMore.vue';
+
+export default {
+  components: {
+    ReadMore,
+  },
+  mixins: [messageFormatterMixin],
+  props: {
+    author: {
+      type: String,
+      default: '',
+    },
+    content: {
+      type: String,
+      default: '',
+    },
+    searchTerm: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      isOverflowing: false,
+    };
+  },
+  computed: {
+    messageContent() {
+      return this.formatMessage(this.content);
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      const wrap = this.$refs.messageContainer;
+      const message = wrap.querySelector('.message-content');
+      this.isOverflowing = message.offsetHeight > 150;
+    });
+  },
+  methods: {
+    escapeHtml(html) {
+      var text = document.createTextNode(html);
+      var p = document.createElement('p');
+      p.appendChild(text);
+      return p.innerText;
+    },
+    prepareContent(content = '') {
+      const escapedText = this.escapeHtml(content);
+      const plainTextContent = this.getPlainText(escapedText);
+      const escapedSearchTerm = this.escapeRegExp(this.searchTerm);
+      return plainTextContent
+        .replace(
+          new RegExp(`(${escapedSearchTerm})`, 'ig'),
+          '<span class="searchkey--highlight">$1</span>'
+        )
+        .replace(/\s{2,}|\n|\r/g, ' ');
+    },
+    // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+    escapeRegExp(string) {
+      return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.message {
+  border-color: var(--s-100);
+  border-width: var(--space-micro);
+  padding: 0 var(--space-small);
+  margin-top: var(--space-small);
+}
+.message-content::v-deep p,
+.message-content::v-deep li::marker {
+  color: var(--s-700);
+  margin-bottom: var(--space-smaller);
+}
+.author {
+  color: var(--s-700);
+}
+.header {
+  color: var(--s-500);
+  margin-bottom: var(--space-smaller);
+}
+
+.message-content {
+  overflow-wrap: break-word;
+}
+
+.message-content::v-deep .searchkey--highlight {
+  color: var(--w-600);
+  font-weight: var(--font-weight-bold);
+  font-size: var(--font-size-small);
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/components/ReadMore.vue b/app/javascript/dashboard/modules/search/components/ReadMore.vue
new file mode 100644
index 000000000..db80de4a8
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/ReadMore.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="read-more">
+    <div ref="content" :class="{ 'shrink-container': shrink }">
+      <slot />
+      <woot-button
+        v-if="shrink"
+        size="tiny"
+        variant="smooth"
+        color-scheme="primary"
+        class="read-more-button"
+        @click.prevent="$emit('expand')"
+      >
+        {{ $t('SEARCH.READ_MORE') }}
+      </woot-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    shrink: {
+      type: Boolean,
+      default: false,
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.shrink-container {
+  max-height: 100px;
+  overflow: hidden;
+  position: relative;
+}
+.shrink-container::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 50px;
+  background: linear-gradient(to bottom, rgba(255, 255, 255, 0), #fff 100%);
+  z-index: 4;
+}
+.read-more-button {
+  max-width: max-content;
+  position: absolute;
+  bottom: var(--space-small);
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+  z-index: 5;
+  box-shadow: var(--box-shadow);
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
new file mode 100644
index 000000000..ae0d786d9
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="input-container">
+    <div class="icon-container">
+      <fluent-icon icon="search" class="icon" aria-hidden="true" />
+    </div>
+    <input
+      ref="searchInput"
+      type="search"
+      :placeholder="$t('SEARCH.INPUT_PLACEHOLDER')"
+      :value="searchQuery"
+      @input="debounceSearch"
+    />
+    <div class="key-binding">
+      <span>{{ $t('SEARCH.PLACEHOLDER_KEYBINDING') }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      searchQuery: '',
+    };
+  },
+  mounted() {
+    this.$refs.searchInput.focus();
+    document.addEventListener('keydown', this.handler);
+  },
+  beforeDestroy() {
+    document.removeEventListener('keydown', this.handler);
+  },
+  methods: {
+    handler(e) {
+      if (e.key === '/' && document.activeElement.tagName !== 'INPUT') {
+        e.preventDefault();
+        this.$refs.searchInput.focus();
+      }
+    },
+    debounceSearch(e) {
+      this.searchQuery = e.target.value;
+      clearTimeout(this.debounce);
+      this.debounce = setTimeout(async () => {
+        if (this.searchQuery.length > 2 || this.searchQuery.match(/^[0-9]+$/)) {
+          this.$emit('search', this.searchQuery);
+        }
+      }, 500);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.input-container {
+  position: relative;
+  border-radius: var(--border-radius-normal);
+  input[type='search'] {
+    width: 100%;
+    padding-left: calc(var(--space-large) + var(--space-small));
+    margin-bottom: 0;
+    padding-right: var(--space-mega);
+    &:focus {
+      .icon {
+        color: var(--w-500) !important;
+      }
+    }
+  }
+}
+.icon-container {
+  padding-left: var(--space-small);
+  display: flex;
+  align-items: center;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  .icon {
+    color: var(--s-400);
+  }
+}
+.key-binding {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  padding: var(--space-small) var(--space-small) 0 var(--space-small);
+  span {
+    color: var(--s-400);
+    font-weight: var(--font-weight-medium);
+    font-size: calc(var(--space-slab) + var(--space-micro));
+    padding: 0 var(--space-small);
+    border: 1px solid var(--s-100);
+    border-radius: var(--border-radius-normal);
+    display: inline-flex;
+    align-items: center;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
index cbfb35c83..c4c4d157f 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
@@ -19,8 +19,8 @@ import { frontendURL } from 'dashboard/helper/URLHelper';
 export default {
   props: {
     id: {
-      type: String,
-      default: '',
+      type: [String, Number],
+      default: 0,
     },
     email: {
       type: String,
@@ -39,8 +39,8 @@ export default {
       default: '',
     },
     accountId: {
-      type: String,
-      default: '',
+      type: [String, Number],
+      default: 0,
     },
   },
   computed: {
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
new file mode 100644
index 000000000..1c343451c
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
@@ -0,0 +1,49 @@
+<template>
+  <search-result-section
+    :title="$t('SEARCH.SECTION.CONTACTS')"
+    :empty="!contacts.length"
+    :query="query"
+  >
+    <ul class="search-list">
+      <li v-for="contact in contacts" :key="contact.id">
+        <search-result-contact-item
+          :id="contact.id"
+          :name="contact.name"
+          :email="contact.email"
+          :phone="contact.phone_number"
+          :account-id="accountId"
+          :thumbnail="contact.thumbnail"
+        />
+      </li>
+    </ul>
+  </search-result-section>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+
+import SearchResultSection from './SearchResultSection.vue';
+import SearchResultContactItem from './SearchResultContactItem.vue';
+
+export default {
+  components: {
+    SearchResultSection,
+    SearchResultContactItem,
+  },
+  props: {
+    contacts: {
+      type: Array,
+      default: () => [],
+    },
+    query: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
index 1b8ec65d2..2c47a4989 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
@@ -17,10 +17,10 @@
           </div>
         </div>
         <div>
-          <span>{{ createdAtTime }}</span>
+          <span class="created-at">{{ createdAtTime }}</span>
         </div>
       </div>
-      <h5 class="text-block-title name">
+      <h5 v-if="name" class="text-block-title name">
         <span class="pre-text">from:</span>
         {{ name }}
       </h5>
@@ -41,12 +41,8 @@ export default {
   mixins: [timeMixin],
   props: {
     id: {
-      type: String,
-      default: '',
-    },
-    email: {
-      type: String,
-      default: '',
+      type: Number,
+      default: 0,
     },
     inbox: {
       type: Object,
@@ -56,12 +52,8 @@ export default {
       type: String,
       default: '',
     },
-    thumbnail: {
-      type: String,
-      default: '',
-    },
     accountId: {
-      type: String,
+      type: [String, Number],
       default: '',
     },
     createdAt: {
@@ -101,6 +93,7 @@ export default {
 .icon-wrap {
   width: var(--space-medium);
   height: var(--space-medium);
+  flex-shrink: 0;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -122,12 +115,13 @@ export default {
 .conversation-details {
   margin-left: var(--space-normal);
   flex-grow: 1;
+  min-width: 0;
 }
 .conversation-id,
 .name {
   margin: 0;
 }
-
+.created-at,
 .pre-text {
   color: var(--s-600);
   font-size: var(--font-size-mini);
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
new file mode 100644
index 000000000..40a6ddb7b
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
@@ -0,0 +1,47 @@
+<template>
+  <search-result-section
+    :title="$t('SEARCH.SECTION.CONVERSATIONS')"
+    :empty="!conversations.length"
+    :query="query"
+  >
+    <ul class="search-list">
+      <li v-for="conversation in conversations" :key="conversation.id">
+        <search-result-conversation-item
+          :id="conversation.id"
+          :name="conversation.contact.name"
+          :account-id="accountId"
+          :inbox="conversation.inbox"
+          :created-at="conversation.created_at"
+        />
+      </li>
+    </ul>
+  </search-result-section>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import SearchResultSection from './SearchResultSection.vue';
+import SearchResultConversationItem from './SearchResultConversationItem.vue';
+
+export default {
+  components: {
+    SearchResultSection,
+    SearchResultConversationItem,
+  },
+  props: {
+    conversations: {
+      type: Array,
+      default: () => [],
+    },
+    query: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue b/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
new file mode 100644
index 000000000..4dbbb3bcd
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
@@ -0,0 +1,61 @@
+<template>
+  <search-result-section
+    :title="$t('SEARCH.SECTION.MESSAGES')"
+    :empty="!messages.length"
+    :query="query"
+  >
+    <ul class="search-list">
+      <li v-for="message in messages" :key="message.id">
+        <search-result-conversation-item
+          :id="message.conversation_id"
+          :account-id="accountId"
+          :inbox="message.inbox"
+          :created-at="message.created_at"
+        >
+          <message-content
+            :author="getName(message)"
+            :content="message.content"
+            :search-term="query"
+          />
+        </search-result-conversation-item>
+      </li>
+    </ul>
+  </search-result-section>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import SearchResultConversationItem from './SearchResultConversationItem.vue';
+import SearchResultSection from './SearchResultSection.vue';
+import MessageContent from './MessageContent';
+
+export default {
+  components: {
+    SearchResultConversationItem,
+    SearchResultSection,
+    MessageContent,
+  },
+  props: {
+    messages: {
+      type: Array,
+      default: () => [],
+    },
+    query: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+  methods: {
+    getName(message) {
+      return message && message.sender && message.sender.name
+        ? message.sender.name
+        : this.$t('SEARCH.BOT_LABEL');
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultSection.vue b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
new file mode 100644
index 000000000..a3295c0d6
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
@@ -0,0 +1,70 @@
+<template>
+  <section>
+    <div class="label-container">
+      <h3 class="text-block-title">{{ title }}</h3>
+    </div>
+    <slot />
+    <div v-if="empty" class="empty">
+      <fluent-icon icon="info" size="16px" class="icon" />
+      <p class="empty-state__text">
+        {{ $t('SEARCH.EMPTY_STATE', { item: titleCase, query }) }}
+      </p>
+    </div>
+  </section>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: '',
+    },
+    empty: {
+      type: Boolean,
+      default: false,
+    },
+    query: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    titleCase() {
+      return this.title.toLowerCase();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.search-list {
+  list-style: none;
+  margin: 0;
+  padding: var(--spacing-normal) 0;
+}
+.label-container {
+  position: sticky;
+  top: 0;
+  padding: var(--space-small) 0;
+  z-index: 50;
+  background: var(--white);
+}
+
+.empty {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: var(--space-medium) var(--space-normal);
+  background: var(--s-25);
+  border-radius: var(--border-radius-medium);
+  .icon {
+    color: var(--s-500);
+  }
+  .empty-state__text {
+    text-align: center;
+    color: var(--s-500);
+    margin: 0 var(--space-small);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchTabs.vue b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
new file mode 100644
index 000000000..fa6944562
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="tab-container">
+    <woot-tabs :index="activeTab" :border="false" @change="onTabChange">
+      <woot-tabs-item
+        v-for="item in tabs"
+        :key="item.key"
+        :name="item.name"
+        :count="item.count"
+      />
+    </woot-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    tabs: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      activeTab: 0,
+    };
+  },
+  methods: {
+    onTabChange(index) {
+      this.activeTab = index;
+      this.$emit('tab-change', this.tabs[index].key);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.tab-container {
+  margin-left: var(--space-minus-normal);
+  margin-top: var(--space-small);
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
new file mode 100644
index 000000000..3d43cddc3
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -0,0 +1,202 @@
+<template>
+  <section class="search-root">
+    <woot-button
+      color-scheme="secondary"
+      size="large"
+      icon="dismiss"
+      variant="smooth"
+      class="modal--close"
+      @click="onBack"
+    />
+    <header>
+      <search-header @search="search" />
+      <search-tabs :tabs="tabs" @tab-change="tab => (selectedTab = tab)" />
+    </header>
+    <div class="search-results">
+      <woot-loading-state v-if="uiFlags.isFetching" :message="'Searching'" />
+      <div v-else>
+        <div v-if="all.length">
+          <search-result-contacts-list
+            v-if="filterContacts"
+            :contacts="contacts"
+            :query="query"
+          />
+          <search-result-messages-list
+            v-if="filterMessages"
+            :messages="messages"
+            :query="query"
+          />
+          <search-result-conversations-list
+            v-if="filterConversations"
+            :conversations="conversations"
+            :query="query"
+          />
+        </div>
+        <div v-else-if="showEmptySearchResults" class="empty">
+          <fluent-icon icon="info" size="16px" class="icon" />
+          <p class="empty-state__text">
+            {{ $t('SEARCH.EMPTY_STATE_FULL', { query }) }}
+          </p>
+        </div>
+      </div>
+    </div>
+  </section>
+</template>
+
+<script>
+import SearchHeader from './SearchHeader.vue';
+import SearchTabs from './SearchTabs.vue';
+import SearchResultConversationsList from './SearchResultConversationsList.vue';
+import SearchResultMessagesList from './SearchResultMessagesList.vue';
+import SearchResultContactsList from './SearchResultContactsList.vue';
+import { isEmptyObject } from 'dashboard/helper/commons.js';
+
+import { mapGetters } from 'vuex';
+import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
+export default {
+  components: {
+    SearchHeader,
+    SearchTabs,
+    SearchResultContactsList,
+    SearchResultConversationsList,
+    SearchResultMessagesList,
+  },
+  data() {
+    return {
+      selectedTab: 'all',
+      query: '',
+    };
+  },
+  computed: {
+    ...mapGetters({
+      fullSearchRecords: 'conversationSearch/getFullSearchRecords',
+      uiFlags: 'conversationSearch/getUIFlags',
+    }),
+    contacts() {
+      if (this.fullSearchRecords.contacts) {
+        return this.fullSearchRecords.contacts.map(contact => ({
+          ...contact,
+          type: 'contact',
+        }));
+      }
+      return [];
+    },
+    conversations() {
+      if (this.fullSearchRecords.conversations) {
+        return this.fullSearchRecords.conversations.map(conversation => ({
+          ...conversation,
+          type: 'conversation',
+        }));
+      }
+      return [];
+    },
+    messages() {
+      if (this.fullSearchRecords.messages) {
+        return this.fullSearchRecords.messages.map(message => ({
+          ...message,
+          type: 'message',
+        }));
+      }
+      return [];
+    },
+    all() {
+      return [...this.contacts, ...this.conversations, ...this.messages];
+    },
+    filterContacts() {
+      return this.selectedTab === 'contacts' || this.selectedTab === 'all';
+    },
+    filterConversations() {
+      return this.selectedTab === 'conversations' || this.selectedTab === 'all';
+    },
+    filterMessages() {
+      return this.selectedTab === 'messages' || this.selectedTab === 'all';
+    },
+    totalSearchResultsCount() {
+      return (
+        this.contacts.length + this.conversations.length + this.messages.length
+      );
+    },
+    tabs() {
+      return [
+        {
+          key: 'all',
+          name: this.$t('SEARCH.TABS.ALL'),
+          count: this.totalSearchResultsCount,
+        },
+        {
+          key: 'contacts',
+          name: this.$t('SEARCH.TABS.CONTACTS'),
+          count: this.contacts.length,
+        },
+        {
+          key: 'conversations',
+          name: this.$t('SEARCH.TABS.CONVERSATIONS'),
+          count: this.conversations.length,
+        },
+        {
+          key: 'messages',
+          name: this.$t('SEARCH.TABS.MESSAGES'),
+          count: this.messages.length,
+        },
+      ];
+    },
+    showEmptySearchResults() {
+      return (
+        this.totalSearchResultsCount === 0 &&
+        !isEmptyObject(this.fullSearchRecords)
+      );
+    },
+  },
+  methods: {
+    search(q) {
+      this.query = q;
+      this.$track(CONVERSATION_EVENTS.SEARCH_CONVERSATION);
+      this.$store.dispatch('conversationSearch/fullSearch', { q });
+    },
+    onBack() {
+      this.$router.push({ name: 'home' });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.search-root {
+  max-width: 800px;
+  width: 100%;
+  margin: 0 auto;
+  height: 100%;
+  display: flex;
+  position: relative;
+  padding: var(--space-normal);
+  flex-direction: column;
+  .search-results {
+    flex-grow: 1;
+    height: 100%;
+    overflow-y: auto;
+    margin-top: var(--space-normal);
+  }
+}
+.modal--close {
+  position: fixed;
+  right: var(--space-small);
+  top: var(--space-small);
+}
+
+.empty {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: var(--space-medium) var(--space-normal);
+  background: var(--s-25);
+  border-radius: var(--border-radius-medium);
+  .icon {
+    color: var(--s-500);
+  }
+  .empty-state__text {
+    text-align: center;
+    color: var(--s-500);
+    margin: 0 var(--space-small);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/search.routes.js b/app/javascript/dashboard/modules/search/search.routes.js
new file mode 100644
index 000000000..a805d2316
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/search.routes.js
@@ -0,0 +1,12 @@
+/* eslint-disable storybook/default-exports */
+import SearchView from './components/SearchView.vue';
+import { frontendURL } from '../../helper/URLHelper';
+
+export const routes = [
+  {
+    path: frontendURL('accounts/:accountId/search'),
+    name: 'search',
+    roles: ['administrator', 'agent'],
+    component: SearchView,
+  },
+];
diff --git a/app/javascript/dashboard/modules/search/stories/MessageContent.stories.js b/app/javascript/dashboard/modules/search/stories/MessageContent.stories.js
new file mode 100644
index 000000000..d82d1979b
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/stories/MessageContent.stories.js
@@ -0,0 +1,28 @@
+import MessageContent from '../components/MessageContent.vue';
+
+export default {
+  title: 'Components/Search/MessageContent',
+  component: MessageContent,
+  argTypes: {
+    content: {
+      defaultValue: '123',
+      control: {
+        type: 'text',
+      },
+    },
+    author: {
+      defaultValue: 'John Doe',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { MessageContent },
+  template: '<message-content v-bind="$props"></message-content>',
+});
+
+export const MessageResultItem = Template.bind({});
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
index c62ae2e0f..1c5072dd4 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -1,58 +1,18 @@
 <template>
-  <div v-on-clickaway="closeSearch" class="search-wrap">
-    <div class="search-header--wrap" :class="{ 'is-active': showSearchBox }">
-      <woot-sidemenu-icon v-if="!showSearchBox" />
-      <div class="search" :class="{ 'is-active': showSearchBox }">
+  <div class="search-wrap">
+    <div class="search" :class="{ 'is-active': showSearchBox }">
+      <woot-sidemenu-icon />
+      <router-link :to="searchUrl" class="search--link" replace>
         <div class="icon">
           <fluent-icon icon="search" class="search--icon" size="16" />
         </div>
-        <input
-          v-model="searchTerm"
-          class="search--input"
-          :placeholder="$t('CONVERSATION.SEARCH_MESSAGES')"
-          @focus="onSearch"
-        />
-      </div>
+        <p class="search--label">{{ $t('CONVERSATION.SEARCH_MESSAGES') }}</p>
+      </router-link>
       <switch-layout
-        v-if="!showSearchBox"
         :is-on-expanded-layout="isOnExpandedLayout"
         @toggle="$emit('toggle-conversation-layout')"
       />
     </div>
-    <div v-if="showSearchBox" class="results-wrap">
-      <div class="show-results">
-        <div>
-          <div class="result-view">
-            <div class="result">
-              {{ $t('CONVERSATION.SEARCH.RESULT_TITLE') }}
-              <span v-if="resultsCount" class="message-counter">
-                ({{ resultsCount }})
-              </span>
-            </div>
-            <div v-if="uiFlags.isFetching" class="search--activity-message">
-              <woot-spinner size="" />
-              {{ $t('CONVERSATION.SEARCH.LOADING_MESSAGE') }}
-            </div>
-          </div>
-
-          <div v-if="showSearchResult" class="search-results--container">
-            <result-item
-              v-for="conversation in conversations"
-              :key="conversation.messageId"
-              :conversation-id="conversation.id"
-              :user-name="conversation.contact.name"
-              :timestamp="conversation.created_at"
-              :messages="conversation.messages"
-              :search-term="searchTerm"
-              :inbox-name="conversation.inbox.name"
-            />
-          </div>
-          <div v-else-if="showEmptyResult" class="search--activity-no-message">
-            {{ $t('CONVERSATION.SEARCH.NO_MATCHING_RESULTS') }}
-          </div>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 
@@ -60,15 +20,13 @@
 import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 import timeMixin from '../../../../mixins/time';
-import ResultItem from './ResultItem';
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import SwitchLayout from './SwitchLayout.vue';
+import { frontendURL } from 'dashboard/helper/URLHelper';
 export default {
   components: {
-    ResultItem,
     SwitchLayout,
   },
-
   directives: {
     focus: {
       inserted(el) {
@@ -76,9 +34,7 @@ export default {
       },
     },
   },
-
   mixins: [timeMixin, messageFormatterMixin, clickaway],
-
   props: {
     isOnExpandedLayout: {
       type: Boolean,
@@ -95,59 +51,10 @@ export default {
 
   computed: {
     ...mapGetters({
-      conversations: 'conversationSearch/getConversations',
-      uiFlags: 'conversationSearch/getUIFlags',
-      currentPage: 'conversationPage/getCurrentPage',
+      accountId: 'getCurrentAccountId',
     }),
-    resultsCount() {
-      return this.conversations.length;
-    },
-    showSearchResult() {
-      return (
-        this.searchTerm && this.conversations.length && !this.uiFlags.isFetching
-      );
-    },
-    showEmptyResult() {
-      return (
-        this.searchTerm &&
-        !this.conversations.length &&
-        !this.uiFlags.isFetching
-      );
-    },
-  },
-
-  watch: {
-    searchTerm(newValue) {
-      if (this.typingTimer) {
-        clearTimeout(this.typingTimer);
-      }
-
-      this.typingTimer = setTimeout(() => {
-        this.hasSearched = true;
-        this.$store.dispatch('conversationSearch/get', { q: newValue });
-      }, 1000);
-    },
-    currentPage() {
-      this.clearSearchTerm();
-    },
-  },
-
-  mounted() {
-    this.$store.dispatch('conversationSearch/get', { q: '' });
-    bus.$on('clearSearchInput', () => {
-      this.clearSearchTerm();
-    });
-  },
-
-  methods: {
-    onSearch() {
-      this.showSearchBox = true;
-    },
-    closeSearch() {
-      this.showSearchBox = false;
-    },
-    clearSearchTerm() {
-      this.searchTerm = '';
+    searchUrl() {
+      return frontendURL(`accounts/${this.accountId}/search`);
     },
   },
 };
@@ -156,30 +63,34 @@ export default {
 <style lang="scss" scoped>
 .search-wrap {
   position: relative;
-  padding: var(--space-one) var(--space-normal) var(--space-smaller)
-    var(--space-normal);
-}
-
-.search-header--wrap {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  min-height: var(--space-large);
 }
 
 .search {
   display: flex;
-  flex: 1;
-  padding: 0 var(--space-smaller);
+  padding: 0;
   border-bottom: 1px solid transparent;
+  padding: var(--space-one) var(--space-normal) var(--space-smaller)
+    var(--space-normal);
 
   &:hover {
-    .search--icon {
+    .search--icon,
+    .search--label {
       color: var(--w-500);
     }
   }
 }
 
+.search--link {
+  display: inline-flex;
+  align-items: center;
+  flex: 1;
+}
+
+.search--label {
+  color: var(--color-body);
+  margin-bottom: 0;
+}
+
 .search--input {
   align-items: center;
   border: 0;
@@ -215,7 +126,6 @@ input::placeholder {
   width: 100%;
   max-height: 70vh;
   overflow: auto;
-  left: 0;
 }
 
 .show-results {
diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
index 8a7ebee72..131789fa0 100644
--- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
@@ -1,6 +1,7 @@
 import AppContainer from './Dashboard';
 import settings from './settings/settings.routes';
 import conversation from './conversation/conversation.routes';
+import { routes as searchRoutes } from '../../modules/search/search.routes';
 import { routes as contactRoutes } from './contacts/routes';
 import { routes as notificationRoutes } from './notifications/routes';
 import { frontendURL } from '../../helper/URLHelper';
@@ -18,6 +19,7 @@ export default {
         ...conversation.routes,
         ...settings.routes,
         ...contactRoutes,
+        ...searchRoutes,
         ...notificationRoutes,
       ],
     },
diff --git a/app/javascript/dashboard/store/modules/conversationSearch.js b/app/javascript/dashboard/store/modules/conversationSearch.js
index c289de62a..7c1e97d8c 100644
--- a/app/javascript/dashboard/store/modules/conversationSearch.js
+++ b/app/javascript/dashboard/store/modules/conversationSearch.js
@@ -1,7 +1,8 @@
-import ConversationAPI from '../../api/inbox/conversation';
+import SearchAPI from '../../api/search';
 import types from '../mutation-types';
 export const initialState = {
   records: [],
+  fullSearchRecords: {},
   uiFlags: {
     isFetching: false,
   },
@@ -11,6 +12,9 @@ export const getters = {
   getConversations(state) {
     return state.records;
   },
+  getFullSearchRecords(state) {
+    return state.fullSearchRecords;
+  },
   getUIFlags(state) {
     return state.uiFlags;
   },
@@ -26,12 +30,29 @@ export const actions = {
     try {
       const {
         data: { payload },
-      } = await ConversationAPI.search({ q });
+      } = await SearchAPI.get({ q });
       commit(types.SEARCH_CONVERSATIONS_SET, payload);
     } catch (error) {
       // Ignore error
     } finally {
-      commit(types.SEARCH_CONVERSATIONS_SET_UI_FLAG, { isFetching: false });
+      commit(types.SEARCH_CONVERSATIONS_SET_UI_FLAG, {
+        isFetching: false,
+      });
+    }
+  },
+  async fullSearch({ commit }, { q }) {
+    commit(types.FULL_SEARCH_SET, []);
+    if (!q) {
+      return;
+    }
+    commit(types.FULL_SEARCH_SET_UI_FLAG, { isFetching: true });
+    try {
+      const { data } = await SearchAPI.get({ q });
+      commit(types.FULL_SEARCH_SET, data.payload);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.FULL_SEARCH_SET_UI_FLAG, { isFetching: false });
     }
   },
 };
@@ -40,9 +61,15 @@ export const mutations = {
   [types.SEARCH_CONVERSATIONS_SET](state, records) {
     state.records = records;
   },
+  [types.FULL_SEARCH_SET](state, records) {
+    state.fullSearchRecords = records;
+  },
   [types.SEARCH_CONVERSATIONS_SET_UI_FLAG](state, uiFlags) {
     state.uiFlags = { ...state.uiFlags, ...uiFlags };
   },
+  [types.FULL_SEARCH_SET_UI_FLAG](state, uiFlags) {
+    state.uiFlags = { ...state.uiFlags, ...uiFlags };
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index ceff83fab..1dc0b997d 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -261,6 +261,9 @@ export default {
   EDIT_MACRO: 'EDIT_MACRO',
   DELETE_MACRO: 'DELETE_MACRO',
 
+  // Full Search
+  FULL_SEARCH_SET: 'FULL_SEARCH_SET',
+  FULL_SEARCH_SET_UI_FLAG: 'FULL_SEARCH_SET_UI_FLAG',
   SET_CONVERSATION_PARTICIPANTS_UI_FLAG:
     'SET_CONVERSATION_PARTICIPANTS_UI_FLAG',
   SET_CONVERSATION_PARTICIPANTS: 'SET_CONVERSATION_PARTICIPANTS',
diff --git a/app/views/api/v1/accounts/search/_message.json.jbuilder b/app/views/api/v1/accounts/search/_message.json.jbuilder
index a5e7bce42..98ac728d6 100644
--- a/app/views/api/v1/accounts/search/_message.json.jbuilder
+++ b/app/views/api/v1/accounts/search/_message.json.jbuilder
@@ -6,9 +6,7 @@ json.source_id message.source_id
 json.inbox_id message.inbox_id
 json.conversation_id message.conversation.try(:display_id)
 json.created_at message.created_at.to_i
-json.agent do
-  json.partial! 'agent', formats: [:json], agent: message.conversation.try(:assignee) if message.conversation.try(:assignee).present?
-end
+json.sender message.sender.push_event_data if message.sender
 json.inbox do
   json.partial! 'inbox', formats: [:json], inbox: message.inbox if message.inbox.present? && message.try(:inbox).present?
 end

From 9c6eb8b03d118e3e308de3072987b76c88901a40 Mon Sep 17 00:00:00 2001
From: Wojtek <36932836+mani-zur@users.noreply.github.com>
Date: Fri, 3 Mar 2023 19:22:25 +0100
Subject: [PATCH 62/94] chore: Fix the comment in schedule.yml (#6606)

---
 config/schedule.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/schedule.yml b/config/schedule.yml
index 94aca4896..5f8a0f97f 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -14,7 +14,7 @@ trigger_scheduled_items_job:
   class: 'TriggerScheduledItemsJob'
   queue: scheduled_jobs
 
-# executed At every 5th minute..
+# executed At every minute..
 trigger_imap_email_inboxes_job:
   cron: '*/1 * * * *'
   class: 'Inboxes::FetchImapEmailInboxesJob'

From 2abc57300c330298ab1b17438eae5a002a4de12a Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 6 Mar 2023 17:47:35 +0530
Subject: [PATCH 63/94] fix: Add a check for automation_created message in
 FIRST_REPLY_CREATED event (#6618)

---
 app/models/message.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index 01b385f27..7596dedaf 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -196,9 +196,13 @@ class Message < ApplicationRecord
                 .where("(additional_attributes->'campaign_id') is null").count == 1
   end
 
+  def not_created_by_automation?
+    content_attributes['automation_rule_id'].blank?
+  end
+
   def dispatch_create_events
     Rails.configuration.dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
-    if outgoing? && first_human_response?
+    if outgoing? && first_human_response? && not_created_by_automation?
       Rails.configuration.dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
     end
   end

From c88792f4a3ca84cb6d261cc9b89a3c1627083223 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 7 Mar 2023 09:01:58 +0530
Subject: [PATCH 64/94] feat: add Conversation traffic heatmap (#6508)

* feat: add heatmap component

* feat: add heatmap component

* feat: add dummy heatmap

* refactor: compact tiles

* feat: allow hour

* feat: wire up heatmap query

* feat: allow arbritrary number of weeks

* feat: update position of the widget

* chore: update heatmap title

* refactor: move traffic heatmap to overview

* chore: add comment for perf

* feat: add reconcile logic for heatmap fetching

Fetching the data for the last 6 days all the time is wasteful
So we fetch only the data for today and reconcile it with the data we already have

* refactor: re-org code for new utils

* feat: add translations

* feat: translate days of the week

* chore: update chatwoot utils

* feat: add markers to heatmap

* refactor: update class names

* refactor: move flatten as a separate method

* test: Heatmap Helpers

* chore: add comments

* refactor: method naming

* refactor: use heatmap-level mixin

* refactor: cleanup css

* chore: remove log

* refactor: reports.js to use object instead of separate params

* refactor: report store to use new API design

* refactor: rename HeatmapHelper -> ReportsDataHelper

* refactor: separate clampDataBetweenTimeline

* feat: add tests

* fix: group by hour

* feat: add scroll for smaller screens

* refactor: add base data to reconcile with

* fix: tests

* fix: overflow only on smaller screens

* feat: translate tooltip

* refactor: simplify reconcile

* chore: add docs

* chore: remoev heatmap from account report

* feat: let Heatmap handle loading state

* chore: Apply suggestions from code review

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>

* feat: update css

* refactor: color assignment to range

* feat: add short circuit

* Update app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue

---------

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>
---
 app/builders/v2/report_builder.rb             |   2 +-
 app/javascript/dashboard/api/reports.js       |   6 +-
 .../dashboard/api/specs/reports.spec.js       |   6 +-
 .../dashboard/i18n/locale/en/report.json      |  17 +-
 .../dashboard/settings/reports/Index.vue      |   2 +-
 .../settings/reports/LiveReports.vue          |  47 +++
 .../settings/reports/components/Heatmap.vue   | 307 ++++++++++++++++++
 .../dashboard/store/modules/reports.js        |  45 ++-
 .../dashboard/store/mutation-types.js         |   2 +
 .../shared/helpers/ReportsDataHelper.js       | 110 +++++++
 .../helpers/specs/ReportsDataHelper.spec.js   | 204 ++++++++++++
 package.json                                  |   2 +-
 yarn.lock                                     |   8 +-
 13 files changed, 733 insertions(+), 25 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
 create mode 100644 app/javascript/shared/helpers/ReportsDataHelper.js
 create mode 100644 app/javascript/shared/helpers/specs/ReportsDataHelper.spec.js

diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
index 5cd8b4a63..b786ba25c 100644
--- a/app/builders/v2/report_builder.rb
+++ b/app/builders/v2/report_builder.rb
@@ -74,7 +74,7 @@ class V2::ReportBuilder
       :created_at,
       default_value: 0,
       range: range,
-      permit: %w[day week month year],
+      permit: %w[day week month year hour],
       time_zone: @timezone
     )
   end
diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index 61fd0adca..6b3249e25 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -8,15 +8,15 @@ class ReportsAPI extends ApiClient {
     super('reports', { accountScoped: true, apiVersion: 'v2' });
   }
 
-  getReports(
+  getReports({
     metric,
     since,
     until,
     type = 'account',
     id,
     group_by,
-    business_hours
-  ) {
+    business_hours,
+  }) {
     return axios.get(`${this.url}`, {
       params: {
         metric,
diff --git a/app/javascript/dashboard/api/specs/reports.spec.js b/app/javascript/dashboard/api/specs/reports.spec.js
index 4e2a8f38f..602e5a67d 100644
--- a/app/javascript/dashboard/api/specs/reports.spec.js
+++ b/app/javascript/dashboard/api/specs/reports.spec.js
@@ -20,7 +20,11 @@ describe('#Reports API', () => {
   });
   describeWithAPIMock('API calls', context => {
     it('#getAccountReports', () => {
-      reportsAPI.getReports('conversations_count', 1621103400, 1621621800);
+      reportsAPI.getReports({
+        metric: 'conversations_count',
+        since: 1621103400,
+        until: 1621621800,
+      });
       expect(context.axiosMock.get).toHaveBeenCalledWith('/api/v2/reports', {
         params: {
           metric: 'conversations_count',
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index 1dbd24efd..6ff093260 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -390,10 +390,16 @@
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Open Conversations",
       "LOADING_MESSAGE": "Loading conversation metrics...",
-      "OPEN" : "Open",
+      "OPEN": "Open",
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -411,5 +417,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index 15db4d805..f496e1b97 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -8,7 +8,6 @@
     >
       {{ $t('REPORT.DOWNLOAD_AGENT_REPORTS') }}
     </woot-button>
-
     <report-filter-selector
       group-by-filter
       :selected-group-by-filter="selectedGroupByFilter"
@@ -70,6 +69,7 @@ const REPORTS_KEYS = {
 };
 
 export default {
+  name: 'ConversationReports',
   components: {
     ReportFilterSelector,
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
index 9ac93827f..5de08717f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
@@ -36,6 +36,16 @@
         </metric-card>
       </div>
     </div>
+    <div class="row">
+      <metric-card
+        :header="this.$t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.HEADER')"
+      >
+        <report-heatmap
+          :heat-data="accountConversationHeatmap"
+          :is-loading="uiFlags.isFetchingAccountConversationsHeatmap"
+        />
+      </metric-card>
+    </div>
     <div class="row">
       <metric-card
         :header="this.$t('OVERVIEW_REPORTS.AGENT_CONVERSATIONS.HEADER')"
@@ -56,11 +66,19 @@ import { mapGetters } from 'vuex';
 import AgentTable from './components/overview/AgentTable';
 import MetricCard from './components/overview/MetricCard';
 import { OVERVIEW_METRICS } from './constants';
+import ReportHeatmap from './components/Heatmap';
+
+import endOfDay from 'date-fns/endOfDay';
+import getUnixTime from 'date-fns/getUnixTime';
+import startOfDay from 'date-fns/startOfDay';
+import subDays from 'date-fns/subDays';
+
 export default {
   name: 'LiveReports',
   components: {
     AgentTable,
     MetricCard,
+    ReportHeatmap,
   },
   data() {
     return {
@@ -73,6 +91,7 @@ export default {
       agents: 'agents/getAgents',
       accountConversationMetric: 'getAccountConversationMetric',
       agentConversationMetric: 'getAgentConversationMetric',
+      accountConversationHeatmap: 'getAccountConversationHeatmapData',
       uiFlags: 'getOverviewUIFlags',
     }),
     agentStatusMetrics() {
@@ -108,6 +127,34 @@ export default {
     fetchAllData() {
       this.fetchAccountConversationMetric();
       this.fetchAgentConversationMetric();
+      this.fetchHeatmapData();
+    },
+    fetchHeatmapData() {
+      if (this.uiFlags.isFetchingAccountConversationsHeatmap) {
+        return;
+      }
+
+      // the data for the last 6 days won't ever change,
+      // so there's no need to fetch it again
+      // but we can write some logic to check if the data is already there
+      // if it is there, we can refetch data only for today all over again
+      // and reconcile it with the rest of the data
+      // this will reduce the load on the server doing number crunching
+      let to = endOfDay(new Date());
+      let from = startOfDay(subDays(to, 6));
+
+      if (this.accountConversationHeatmap.length) {
+        to = endOfDay(new Date());
+        from = startOfDay(to);
+      }
+
+      this.$store.dispatch('fetchAccountConversationHeatmap', {
+        metric: 'conversations_count',
+        from: getUnixTime(from),
+        to: getUnixTime(to),
+        groupBy: 'hour',
+        businessHours: false,
+      });
     },
     fetchAccountConversationMetric() {
       this.$store.dispatch('fetchAccountConversationMetric', {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
new file mode 100644
index 000000000..a856dbe88
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
@@ -0,0 +1,307 @@
+<template>
+  <div class="heatmap-container">
+    <template v-if="isLoading">
+      <div class="heatmap-labels">
+        <div
+          v-for="ii in 7"
+          :key="ii"
+          class="loading-cell heatmap-axis-label"
+        />
+      </div>
+      <div class="heatmap-grid">
+        <div v-for="ii in 7" :key="ii" class="heatmap-grid-row">
+          <div v-for="jj in 24" :key="jj" class="heatmap-tile loading-cell">
+            <div class="heatmap-tile__label loading-cell" />
+          </div>
+        </div>
+      </div>
+      <div class="heatmap-timeline" />
+      <div class="heatmap-markers">
+        <div v-for="ii in 24" :key="ii">{{ ii - 1 }} – {{ ii }}</div>
+      </div>
+    </template>
+    <template v-else>
+      <div class="heatmap-labels">
+        <div
+          v-for="dateKey in processedData.keys()"
+          :key="dateKey"
+          class="heatmap-axis-label"
+        >
+          {{ getDayOfTheWeek(new Date(dateKey)) }}
+          <time>{{ formatDate(dateKey) }}</time>
+        </div>
+      </div>
+      <div class="heatmap-grid">
+        <div
+          v-for="dateKey in processedData.keys()"
+          :key="dateKey"
+          class="heatmap-grid-row"
+        >
+          <div
+            v-for="data in processedData.get(dateKey)"
+            :key="data.timestamp"
+            v-tooltip.top="getCountTooltip(data.value)"
+            class="heatmap-tile"
+            :class="getHeatmapLevelClass(data.value)"
+          >
+            <div class="heatmap-tile__label" />
+          </div>
+        </div>
+      </div>
+      <div class="heatmap-timeline" />
+      <div class="heatmap-markers">
+        <div v-for="ii in 24" :key="ii">{{ ii - 1 }} – {{ ii }}</div>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { getQuantileIntervals } from '@chatwoot/utils';
+import format from 'date-fns/format';
+import getDay from 'date-fns/getDay';
+
+import { groupHeatmapByDay } from 'helpers/ReportsDataHelper';
+
+export default {
+  name: 'Heatmap',
+  props: {
+    heatData: {
+      type: Array,
+      default: () => [],
+    },
+    isLoading: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    processedData() {
+      return groupHeatmapByDay(this.heatData);
+    },
+    quantileRange() {
+      const flattendedData = this.heatData.map(data => data.value);
+      return getQuantileIntervals(flattendedData, [
+        0.2,
+        0.4,
+        0.6,
+        0.8,
+        0.9,
+        0.99,
+      ]);
+    },
+  },
+  methods: {
+    getCountTooltip(value) {
+      if (!value) {
+        return this.$t(
+          'OVERVIEW_REPORTS.CONVERSATION_HEATMAP.NO_CONVERSATIONS'
+        );
+      }
+
+      if (value === 1) {
+        return this.$t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.CONVERSATION', {
+          count: value,
+        });
+      }
+
+      return this.$t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.CONVERSATIONS', {
+        count: value,
+      });
+    },
+    formatDate(dateString) {
+      return format(new Date(dateString), 'MMM d, yyyy');
+    },
+    getDayOfTheWeek(date) {
+      const dayIndex = getDay(date);
+      const days = [
+        this.$t('DAYS_OF_WEEK.SUNDAY'),
+        this.$t('DAYS_OF_WEEK.MONDAY'),
+        this.$t('DAYS_OF_WEEK.TUESDAY'),
+        this.$t('DAYS_OF_WEEK.WEDNESDAY'),
+        this.$t('DAYS_OF_WEEK.THURSDAY'),
+        this.$t('DAYS_OF_WEEK.FRIDAY'),
+        this.$t('DAYS_OF_WEEK.SATURDAY'),
+      ];
+      return days[dayIndex];
+    },
+    getHeatmapLevelClass(value) {
+      if (!value) return '';
+
+      const level = [...this.quantileRange, Infinity].findIndex(
+        range => value <= range && value > 0
+      );
+
+      if (level > 6) {
+        return 'l6';
+      }
+
+      return `l${level}`;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+$heatmap-colors: (
+  level-1: var(--w-50),
+  level-2: var(--w-100),
+  level-3: var(--w-300),
+  level-4: var(--w-500),
+  level-5: var(--w-700),
+  level-6: var(--w-900),
+);
+
+$heatmap-hover-border-color: (
+  level-1: var(--w-25),
+  level-2: var(--w-50),
+  level-3: var(--w-100),
+  level-4: var(--w-300),
+  level-5: var(--w-500),
+  level-6: var(--w-700),
+);
+
+$tile-height: 3rem;
+$tile-gap: var(--space-smaller);
+$container-gap-row: var(--space-one);
+$container-gap-column: var(--space-two);
+$marker-height: var(--space-two);
+
+@mixin heatmap-level($level) {
+  $color: map-get($heatmap-colors, 'level-#{$level}');
+  background-color: $color;
+  &:hover {
+    border: 1px solid map-get($heatmap-hover-border-color, 'level-#{$level}');
+  }
+}
+
+@media screen and (max-width: 768px) {
+  .heatmap-container {
+    overflow-y: auto;
+  }
+}
+
+.loading-cell {
+  background-color: var(--color-background-light);
+  border: 0px;
+
+  animation: loading-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+}
+
+@keyframes loading-pulse {
+  0%,
+  100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0;
+  }
+}
+
+.heatmap-container {
+  display: grid;
+  position: relative;
+  width: 100%;
+  gap: $container-gap-row $container-gap-column;
+  grid-template-columns: 80px 1fr;
+  min-height: calc(
+    7 * #{$tile-height} + 6 * #{$tile-gap} + #{$container-gap-row} + #{$marker-height}
+  );
+}
+
+.heatmap-labels {
+  display: grid;
+  grid-template-rows: 1fr;
+  gap: $tile-gap;
+  flex-shrink: 0;
+
+  .heatmap-axis-label {
+    height: $tile-height;
+    min-width: 70px;
+    font-size: var(--font-size-micro);
+    font-weight: var(--font-weight-bold);
+    display: flex;
+    flex-direction: column;
+    align-items: end;
+    justify-content: center;
+
+    time {
+      font-size: var(--font-size-micro);
+      font-weight: var(--font-weight-normal);
+    }
+  }
+}
+
+.heatmap-grid {
+  display: grid;
+  grid-template-rows: 1fr;
+  gap: $tile-gap;
+  min-width: 700px;
+  width: 100%;
+
+  .heatmap-grid-row {
+    display: grid;
+    gap: $tile-gap;
+    grid-template-columns: repeat(24, 1fr);
+  }
+
+  .heatmap-tile {
+    width: auto;
+    height: $tile-height;
+    border-radius: var(--border-radius-normal);
+
+    &:hover {
+      box-shadow: var(--shadow-large);
+
+      transform: translateY(-2px);
+      transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out;
+    }
+
+    &:not(.l1):not(.l2):not(.l3):not(.l4):not(.l5):not(.l6) {
+      background-color: var(--color-background-light);
+      border: 1px solid var(--color-border-light);
+
+      &:hover {
+        transform: translateY(0);
+        box-shadow: none;
+        border: 1px solid var(--color-border-light);
+      }
+    }
+
+    &.l1 {
+      @include heatmap-level(1);
+    }
+    &.l2 {
+      @include heatmap-level(2);
+    }
+    &.l3 {
+      @include heatmap-level(3);
+    }
+    &.l4 {
+      @include heatmap-level(4);
+    }
+    &.l5 {
+      @include heatmap-level(5);
+    }
+    &.l6 {
+      @include heatmap-level(6);
+    }
+  }
+}
+
+.heatmap-markers {
+  display: grid;
+  grid-template-columns: repeat(24, 1fr);
+  gap: $tile-gap;
+  width: 100%;
+  font-size: var(--font-size-nano);
+  font-weight: var(--font-weight-bold);
+  height: $marker-height;
+  color: var(--color-body);
+
+  div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 4d4fee959..b51c50113 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -4,6 +4,10 @@ import Report from '../../api/reports';
 import { downloadCsvFile } from '../../helper/downloadHelper';
 import AnalyticsHelper from '../../helper/AnalyticsHelper';
 import { REPORTS_EVENTS } from '../../helper/AnalyticsHelper/events';
+import {
+  reconcileHeatmapData,
+  clampDataBetweenTimeline,
+} from 'helpers/ReportsDataHelper';
 
 const state = {
   fetchingStatus: false,
@@ -24,9 +28,11 @@ const state = {
   overview: {
     uiFlags: {
       isFetchingAccountConversationMetric: false,
+      isFetchingAccountConversationsHeatmap: false,
       isFetchingAgentConversationMetric: false,
     },
     accountConversationMetric: {},
+    accountConversationHeatmap: [],
     agentConversationMetric: [],
   },
 };
@@ -41,6 +47,9 @@ const getters = {
   getAccountConversationMetric(_state) {
     return _state.overview.accountConversationMetric;
   },
+  getAccountConversationHeatmapData(_state) {
+    return _state.overview.accountConversationHeatmap;
+  },
   getAgentConversationMetric(_state) {
     return _state.overview.agentConversationMetric;
   },
@@ -52,24 +61,28 @@ const getters = {
 export const actions = {
   fetchAccountReport({ commit }, reportObj) {
     commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, true);
-    Report.getReports(
-      reportObj.metric,
-      reportObj.from,
-      reportObj.to,
-      reportObj.type,
-      reportObj.id,
-      reportObj.groupBy,
-      reportObj.businessHours
-    ).then(accountReport => {
+    Report.getReports(reportObj).then(accountReport => {
       let { data } = accountReport;
-      data = data.filter(
-        el =>
-          reportObj.to - el.timestamp > 0 && el.timestamp - reportObj.from >= 0
-      );
+      data = clampDataBetweenTimeline(data, reportObj.from, reportObj.to);
       commit(types.default.SET_ACCOUNT_REPORTS, data);
       commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
     });
   },
+  fetchAccountConversationHeatmap({ commit }, reportObj) {
+    commit(types.default.TOGGLE_HEATMAP_LOADING, true);
+    Report.getReports({ ...reportObj, group_by: 'hour' }).then(heatmapData => {
+      let { data } = heatmapData;
+      data = clampDataBetweenTimeline(data, reportObj.from, reportObj.to);
+
+      data = reconcileHeatmapData(
+        data,
+        state.overview.accountConversationHeatmap
+      );
+
+      commit(types.default.SET_HEATMAP_DATA, data);
+      commit(types.default.TOGGLE_HEATMAP_LOADING, false);
+    });
+  },
   fetchAccountSummary({ commit }, reportObj) {
     Report.getSummary(
       reportObj.from,
@@ -172,9 +185,15 @@ const mutations = {
   [types.default.SET_ACCOUNT_REPORTS](_state, accountReport) {
     _state.accountReport.data = accountReport;
   },
+  [types.default.SET_HEATMAP_DATA](_state, heatmapData) {
+    _state.overview.accountConversationHeatmap = heatmapData;
+  },
   [types.default.TOGGLE_ACCOUNT_REPORT_LOADING](_state, flag) {
     _state.accountReport.isFetching = flag;
   },
+  [types.default.TOGGLE_HEATMAP_LOADING](_state, flag) {
+    _state.overview.uiFlags.isFetchingAccountConversationsHeatmap = flag;
+  },
   [types.default.SET_ACCOUNT_SUMMARY](_state, summaryData) {
     _state.accountSummary = summaryData;
   },
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 1dc0b997d..17b01a453 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -143,6 +143,8 @@ export default {
 
   // Reports
   SET_ACCOUNT_REPORTS: 'SET_ACCOUNT_REPORTS',
+  SET_HEATMAP_DATA: 'SET_HEATMAP_DATA',
+  TOGGLE_HEATMAP_LOADING: 'TOGGLE_HEATMAP_LOADING',
   SET_ACCOUNT_SUMMARY: 'SET_ACCOUNT_SUMMARY',
   TOGGLE_ACCOUNT_REPORT_LOADING: 'TOGGLE_ACCOUNT_REPORT_LOADING',
   SET_ACCOUNT_CONVERSATION_METRIC: 'SET_ACCOUNT_CONVERSATION_METRIC',
diff --git a/app/javascript/shared/helpers/ReportsDataHelper.js b/app/javascript/shared/helpers/ReportsDataHelper.js
new file mode 100644
index 000000000..5bfd31861
--- /dev/null
+++ b/app/javascript/shared/helpers/ReportsDataHelper.js
@@ -0,0 +1,110 @@
+import {
+  fromUnixTime,
+  startOfDay,
+  endOfDay,
+  getUnixTime,
+  subDays,
+} from 'date-fns';
+
+/**
+ * Returns a key-value pair of timestamp and value for heatmap data
+ *
+ * @param {Array} data - An array of objects containing timestamp and value
+ * @returns {Object} - An object with timestamp as keys and corresponding values as values
+ */
+export const flattenHeatmapData = data => {
+  return data.reduce((acc, curr) => {
+    acc[curr.timestamp] = curr.value;
+    return acc;
+  }, {});
+};
+
+/**
+ * Filter the given array to remove data outside the timeline
+ *
+ * @param {Array} data - An array of objects containing timestamp and value
+ * @param {number} from - Unix timestamp
+ * @param {number} to - Unix timestamp
+ * @returns {Array} - An array of objects containing timestamp and value
+ */
+export const clampDataBetweenTimeline = (data, from, to) => {
+  if (from === undefined && to === undefined) {
+    return data;
+  }
+
+  return data.filter(el => {
+    const { timestamp } = el;
+
+    const isWithinFrom = from === undefined || timestamp - from >= 0;
+    const isWithinTo = to === undefined || to - timestamp > 0;
+
+    return isWithinFrom && isWithinTo;
+  });
+};
+
+/**
+ * Generates an array of objects with timestamp and value as 0 for the last 7 days
+ *
+ * @returns {Array} - An array of objects containing timestamp and value
+ */
+export const generateEmptyHeatmapData = () => {
+  const data = [];
+  const today = new Date();
+
+  let timeMarker = getUnixTime(startOfDay(subDays(today, 6)));
+  let endOfToday = getUnixTime(endOfDay(today));
+
+  const oneHour = 3600;
+
+  while (timeMarker <= endOfToday) {
+    data.push({ value: 0, timestamp: timeMarker });
+    timeMarker += oneHour;
+  }
+
+  return data;
+};
+
+/**
+ * Reconciles new data with existing heatmap data based on timestamps
+ *
+ * @param {Array} data - An array of objects containing timestamp and value
+ * @param {Array} heatmapData - An array of objects containing timestamp, value and other properties
+ * @returns {Array} - An array of objects with updated values
+ */
+export const reconcileHeatmapData = (data, dataFromStore) => {
+  const parsedData = flattenHeatmapData(data);
+  // make a copy of the data from store
+  const heatmapData = dataFromStore.length
+    ? dataFromStore
+    : generateEmptyHeatmapData();
+
+  return heatmapData.map(dataItem => {
+    if (parsedData[dataItem.timestamp]) {
+      dataItem.value = parsedData[dataItem.timestamp];
+    }
+    return dataItem;
+  });
+};
+
+/**
+ * Groups heatmap data by day
+ *
+ * @param {Array} heatmapData - An array of objects containing timestamp, value and other properties
+ * @returns {Map} - A Map object with dates as keys and corresponding data objects as values
+ */
+export const groupHeatmapByDay = heatmapData => {
+  return heatmapData.reduce((acc, data) => {
+    const date = fromUnixTime(data.timestamp);
+    const mapKey = startOfDay(date).toISOString();
+    const dataToAppend = {
+      ...data,
+      date: fromUnixTime(data.timestamp),
+      hour: date.getHours(),
+    };
+    if (!acc.has(mapKey)) {
+      acc.set(mapKey, []);
+    }
+    acc.get(mapKey).push(dataToAppend);
+    return acc;
+  }, new Map());
+};
diff --git a/app/javascript/shared/helpers/specs/ReportsDataHelper.spec.js b/app/javascript/shared/helpers/specs/ReportsDataHelper.spec.js
new file mode 100644
index 000000000..9ac4bb699
--- /dev/null
+++ b/app/javascript/shared/helpers/specs/ReportsDataHelper.spec.js
@@ -0,0 +1,204 @@
+import {
+  groupHeatmapByDay,
+  reconcileHeatmapData,
+  flattenHeatmapData,
+  clampDataBetweenTimeline,
+} from '../ReportsDataHelper';
+
+describe('flattenHeatmapData', () => {
+  it('should flatten heatmap data to key-value pairs', () => {
+    const data = [
+      { timestamp: 1614265200, value: 10 },
+      { timestamp: 1614308400, value: 20 },
+    ];
+    const expected = {
+      1614265200: 10,
+      1614308400: 20,
+    };
+    expect(flattenHeatmapData(data)).toEqual(expected);
+  });
+
+  it('should handle empty data', () => {
+    const data = [];
+    const expected = {};
+    expect(flattenHeatmapData(data)).toEqual(expected);
+  });
+
+  it('should handle data with same timestamps', () => {
+    const data = [
+      { timestamp: 1614265200, value: 10 },
+      { timestamp: 1614265200, value: 20 },
+    ];
+    const expected = {
+      1614265200: 20,
+    };
+    expect(flattenHeatmapData(data)).toEqual(expected);
+  });
+});
+
+describe('reconcileHeatmapData', () => {
+  it('should reconcile heatmap data with new data', () => {
+    const data = [
+      { timestamp: 1614265200, value: 10 },
+      { timestamp: 1614308400, value: 20 },
+    ];
+    const heatmapData = [
+      { timestamp: 1614265200, value: 5 },
+      { timestamp: 1614308400, value: 15 },
+      { timestamp: 1614387600, value: 25 },
+    ];
+    const expected = [
+      { timestamp: 1614265200, value: 10 },
+      { timestamp: 1614308400, value: 20 },
+      { timestamp: 1614387600, value: 25 },
+    ];
+    expect(reconcileHeatmapData(data, heatmapData)).toEqual(expected);
+  });
+
+  it('should reconcile heatmap data with new data and handle missing data', () => {
+    const data = [{ timestamp: 1614308400, value: 20 }];
+    const heatmapData = [
+      { timestamp: 1614265200, value: 5 },
+      { timestamp: 1614308400, value: 15 },
+      { timestamp: 1614387600, value: 25 },
+    ];
+    const expected = [
+      { timestamp: 1614265200, value: 5 },
+      { timestamp: 1614308400, value: 20 },
+      { timestamp: 1614387600, value: 25 },
+    ];
+    expect(reconcileHeatmapData(data, heatmapData)).toEqual(expected);
+  });
+
+  it('should replace empty heatmap data with a new array', () => {
+    const data = [{ timestamp: 1614308400, value: 20 }];
+    const heatmapData = [];
+    expect(reconcileHeatmapData(data, heatmapData).length).toEqual(7 * 24);
+  });
+});
+
+describe('groupHeatmapByDay', () => {
+  it('should group heatmap data by day', () => {
+    const heatmapData = [
+      { timestamp: 1614265200, value: 10 },
+      { timestamp: 1614308400, value: 20 },
+      { timestamp: 1614387600, value: 30 },
+      { timestamp: 1614430800, value: 40 },
+      { timestamp: 1614499200, value: 50 },
+    ];
+
+    expect(groupHeatmapByDay(heatmapData)).toMatchInlineSnapshot(`
+      Map {
+        "2021-02-25T00:00:00.000Z" => Array [
+          Object {
+            "date": 2021-02-25T15:00:00.000Z,
+            "hour": 15,
+            "timestamp": 1614265200,
+            "value": 10,
+          },
+        ],
+        "2021-02-26T00:00:00.000Z" => Array [
+          Object {
+            "date": 2021-02-26T03:00:00.000Z,
+            "hour": 3,
+            "timestamp": 1614308400,
+            "value": 20,
+          },
+        ],
+        "2021-02-27T00:00:00.000Z" => Array [
+          Object {
+            "date": 2021-02-27T01:00:00.000Z,
+            "hour": 1,
+            "timestamp": 1614387600,
+            "value": 30,
+          },
+          Object {
+            "date": 2021-02-27T13:00:00.000Z,
+            "hour": 13,
+            "timestamp": 1614430800,
+            "value": 40,
+          },
+        ],
+        "2021-02-28T00:00:00.000Z" => Array [
+          Object {
+            "date": 2021-02-28T08:00:00.000Z,
+            "hour": 8,
+            "timestamp": 1614499200,
+            "value": 50,
+          },
+        ],
+      }
+    `);
+  });
+
+  it('should group empty heatmap data by day', () => {
+    const heatmapData = [];
+    const expected = new Map();
+    expect(groupHeatmapByDay(heatmapData)).toEqual(expected);
+  });
+
+  it('should group heatmap data with same timestamp in the same day', () => {
+    const heatmapData = [
+      { timestamp: 1614265200, value: 10 },
+      { timestamp: 1614265200, value: 20 },
+    ];
+
+    expect(groupHeatmapByDay(heatmapData)).toMatchInlineSnapshot(`
+      Map {
+        "2021-02-25T00:00:00.000Z" => Array [
+          Object {
+            "date": 2021-02-25T15:00:00.000Z,
+            "hour": 15,
+            "timestamp": 1614265200,
+            "value": 10,
+          },
+          Object {
+            "date": 2021-02-25T15:00:00.000Z,
+            "hour": 15,
+            "timestamp": 1614265200,
+            "value": 20,
+          },
+        ],
+      }
+    `);
+  });
+});
+
+describe('clampDataBetweenTimeline', () => {
+  const data = [
+    { timestamp: 1646054400, value: 'A' },
+    { timestamp: 1646054500, value: 'B' },
+    { timestamp: 1646054600, value: 'C' },
+    { timestamp: 1646054700, value: 'D' },
+    { timestamp: 1646054800, value: 'E' },
+  ];
+
+  it('should return empty array if data is empty', () => {
+    expect(clampDataBetweenTimeline([], 1646054500, 1646054700)).toEqual([]);
+  });
+
+  it('should return empty array if no data is within the timeline', () => {
+    expect(clampDataBetweenTimeline(data, 1646054900, 1646055000)).toEqual([]);
+  });
+
+  it('should return the data as is no time limits are provider', () => {
+    expect(clampDataBetweenTimeline(data)).toEqual(data);
+  });
+
+  it('should return all data if all data is within the timeline', () => {
+    expect(clampDataBetweenTimeline(data, 1646054300, 1646054900)).toEqual(
+      data
+    );
+  });
+
+  it('should return only data within the timeline', () => {
+    expect(clampDataBetweenTimeline(data, 1646054500, 1646054700)).toEqual([
+      { timestamp: 1646054500, value: 'B' },
+      { timestamp: 1646054600, value: 'C' },
+    ]);
+  });
+
+  it('should return empty array if from and to are the same', () => {
+    expect(clampDataBetweenTimeline(data, 1646054500, 1646054500)).toEqual([]);
+  });
+});
diff --git a/package.json b/package.json
index 8b1ce3b45..6f19d9fc2 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git",
-    "@chatwoot/utils": "^0.0.11",
+    "@chatwoot/utils": "^0.0.12",
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
     "@june-so/analytics-next": "^1.36.5",
     "@rails/actioncable": "6.1.3",
diff --git a/yarn.lock b/yarn.lock
index d31a238c1..98eada5a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1410,10 +1410,10 @@
     prosemirror-utils "^0.9.6"
     prosemirror-view "^1.17.2"
 
-"@chatwoot/utils@^0.0.11":
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.11.tgz#6922492e21c20bdb0ef733967a0b94829d8f620f"
-  integrity sha512-uiLsuBYTlZGXJ/d7QfJ+hlO1u7U1750ON5iu0pus8t6GlJQdxvMQWuf6fHQtfsDNcvL1aXsQu3H6BUk/nVZLlw==
+"@chatwoot/utils@^0.0.12":
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.12.tgz#684fb5a475c1c7fdeaa628091e90c7d1decd156e"
+  integrity sha512-3O4zC4SO4z4rD2Chno+pzUUb/GacHQfIBfLCOsHviNzgljUE+neyOhS91yWDfCcd3Y0WmQs7UuXgvulmkdxqKg==
   dependencies:
     date-fns "^2.29.1"
 

From 9c9183a35214f0ddbb7aa425178672335c049a3b Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 7 Mar 2023 17:40:17 +0530
Subject: [PATCH 65/94] chore: spec ensuring first_reply_created doesn't
 trigger automations

Specs to ensure that first_reply_created event doesn't trigger automations

ref: #6618
---
 .../automation_rule_listener_spec.rb          | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 73bc8a80b..11e8ee858 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -630,6 +630,31 @@ describe AutomationRuleListener do
         expect(conversation.messages.count).to eq(2)
         expect(conversation.messages.last.content).to eq('Send this message.')
       end
+
+      describe '#conversation_updated with first_reply_created event' do
+        let(:reporting_event_listener) { ReportingEventListener.instance }
+        let(:human_message) { create(:message, message_type: 'outgoing', account: account, inbox: inbox, conversation: conversation) }
+        let(:first_reply_event) { Events::Base.new('first.reply.created', Time.zone.now, message: human_message) }
+
+        it 'triggers automation rule only once send message to the contacts' do
+          reporting_event_listener.first_reply_created(first_reply_event)
+          listener.message_created(event)
+          conversation.reload
+
+          first_reply = conversation.messages.outgoing.where.not(sender_type: 'AgentBot').where("(additional_attributes->'campaign_id') is null")
+
+          expect(conversation.messages.count).to eq(3)
+          expect(conversation.messages.last.content).to eq('Send this message.')
+          expect(first_reply.count).to eq(1)
+
+          automation_message = conversation.messages.last
+          first_reply_event = Events::Base.new('first.reply.created', Time.zone.now, message: automation_message)
+          reporting_event_listener.first_reply_created(first_reply_event)
+
+          expect(conversation.messages.count).to eq(3)
+          expect(first_reply.count).to eq(1)
+        end
+      end
     end
 
     context 'when rule does not match' do

From d6f3643bf05340540a1728e06ad0263896084a5f Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Tue, 7 Mar 2023 16:57:10 +0300
Subject: [PATCH 66/94] fix : Meta tags input in help center clears the input
 value after clicking outside (#6552)

* chore: supports preserving input value after clicking out

Co-authored-by: BikashSah999 <51731962+BikashSah999@users.noreply.github.com>

* chore: supports tag addition on blur

Co-authored-by: BikashSah999 <51731962+BikashSah999@users.noreply.github.com>

* feat: use search-change instead of vue-multiselect refs

Co-authored-by: BikashSah999 <51731962+BikashSah999@users.noreply.github.com>

---------

Co-authored-by: BikashSah999 <51731962+BikashSah999@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../pages/articles/ArticleSettings.vue        | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
index 773945e15..a8de55770 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
@@ -87,6 +87,9 @@
             track-by="name"
             :multiple="true"
             :taggable="true"
+            :close-on-select="false"
+            @search-change="handleSearchChange"
+            @close="onBlur"
             @tag="addTagValue"
           />
         </label>
@@ -136,6 +139,7 @@ export default {
       metaDescription: '',
       metaTags: [],
       metaOptions: [],
+      tagInputValue: '',
     };
   },
   computed: {
@@ -184,13 +188,22 @@ export default {
       }));
     },
     addTagValue(tagValue) {
-      const tag = {
-        name: tagValue,
-      };
-      this.metaTags.push(tag);
-      this.$refs.tagInput.$el.focus();
+      const tags = tagValue
+        .split(',')
+        .map(tag => tag.trim())
+        .filter(tag => tag && !this.allTags.includes(tag));
+
+      this.metaTags.push(...this.formattedTags({ tags: [...new Set(tags)] }));
       this.saveArticle();
     },
+    handleSearchChange(value) {
+      this.tagInputValue = value;
+    },
+    onBlur() {
+      if (this.tagInputValue) {
+        this.addTagValue(this.tagInputValue);
+      }
+    },
     onClickSelectCategory({ id }) {
       this.$emit('save-article', { category_id: id });
     },

From 5214be67c78c57145add34062bf07fd32a3c3c4b Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Wed, 8 Mar 2023 00:30:00 -0800
Subject: [PATCH 67/94] chore: Update translations

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../dashboard/i18n/locale/ar/report.json      |  15 +
 .../dashboard/i18n/locale/ar/search.json      |  22 +
 .../dashboard/i18n/locale/bg/report.json      |  15 +
 .../dashboard/i18n/locale/bg/search.json      |  22 +
 .../dashboard/i18n/locale/ca/report.json      |  15 +
 .../dashboard/i18n/locale/ca/search.json      |  22 +
 .../dashboard/i18n/locale/cs/report.json      |  15 +
 .../dashboard/i18n/locale/cs/search.json      |  22 +
 .../dashboard/i18n/locale/da/report.json      |  15 +
 .../dashboard/i18n/locale/da/search.json      |  22 +
 .../dashboard/i18n/locale/de/report.json      |  15 +
 .../dashboard/i18n/locale/de/search.json      |  22 +
 .../dashboard/i18n/locale/el/report.json      |  15 +
 .../dashboard/i18n/locale/el/search.json      |  22 +
 .../dashboard/i18n/locale/es/report.json      |  15 +
 .../dashboard/i18n/locale/es/search.json      |  22 +
 .../dashboard/i18n/locale/fa/report.json      |  15 +
 .../dashboard/i18n/locale/fa/search.json      |  22 +
 .../dashboard/i18n/locale/fi/report.json      |  15 +
 .../dashboard/i18n/locale/fi/search.json      |  22 +
 .../dashboard/i18n/locale/fr/report.json      |  15 +
 .../dashboard/i18n/locale/fr/search.json      |  22 +
 .../dashboard/i18n/locale/he/chatlist.json    |  12 +-
 .../dashboard/i18n/locale/he/contact.json     |  30 +-
 .../dashboard/i18n/locale/he/report.json      |  15 +
 .../dashboard/i18n/locale/he/search.json      |  22 +
 .../dashboard/i18n/locale/hi/report.json      |  15 +
 .../dashboard/i18n/locale/hi/search.json      |  22 +
 .../dashboard/i18n/locale/hu/report.json      |  15 +
 .../dashboard/i18n/locale/hu/search.json      |  22 +
 .../i18n/locale/hy/advancedFilters.json       |  93 +++
 .../dashboard/i18n/locale/hy/agentBots.json   |  73 ++
 .../dashboard/i18n/locale/hy/agentMgmt.json   | 113 +++
 .../i18n/locale/hy/attributesMgmt.json        |  99 +++
 .../dashboard/i18n/locale/hy/automation.json  | 118 +++
 .../dashboard/i18n/locale/hy/bulkActions.json |  40 +
 .../dashboard/i18n/locale/hy/campaign.json    | 126 ++++
 .../dashboard/i18n/locale/hy/cannedMgmt.json  |  76 ++
 .../dashboard/i18n/locale/hy/chatlist.json    |  71 ++
 .../dashboard/i18n/locale/hy/contact.json     | 349 +++++++++
 .../i18n/locale/hy/contactFilters.json        |  50 ++
 .../i18n/locale/hy/conversation.json          | 282 +++++++
 .../dashboard/i18n/locale/hy/csatMgmt.json    |   6 +
 .../dashboard/i18n/locale/hy/emoji.json       |   6 +
 .../i18n/locale/hy/generalSettings.json       | 145 ++++
 .../dashboard/i18n/locale/hy/helpCenter.json  | 422 +++++++++++
 .../dashboard/i18n/locale/hy/inboxMgmt.json   | 695 ++++++++++++++++++
 .../i18n/locale/hy/integrationApps.json       |  62 ++
 .../i18n/locale/hy/integrations.json          | 144 ++++
 .../dashboard/i18n/locale/hy/labelsMgmt.json  |  70 ++
 .../dashboard/i18n/locale/hy/login.json       |  26 +
 .../dashboard/i18n/locale/hy/macros.json      |  78 ++
 .../dashboard/i18n/locale/hy/report.json      | 462 ++++++++++++
 .../i18n/locale/hy/resetPassword.json         |  15 +
 .../dashboard/i18n/locale/hy/search.json      |  22 +
 .../i18n/locale/hy/setNewPassword.json        |  23 +
 .../dashboard/i18n/locale/hy/settings.json    | 314 ++++++++
 .../dashboard/i18n/locale/hy/signup.json      |  44 ++
 .../i18n/locale/hy/teamsSettings.json         | 125 ++++
 .../dashboard/i18n/locale/hy/webhooks.json    |   5 +
 .../i18n/locale/hy/whatsappTemplates.json     |  25 +
 .../dashboard/i18n/locale/id/report.json      |  15 +
 .../dashboard/i18n/locale/id/search.json      |  22 +
 .../dashboard/i18n/locale/is/report.json      |  15 +
 .../dashboard/i18n/locale/is/search.json      |  22 +
 .../dashboard/i18n/locale/it/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/it/report.json      |  15 +
 .../dashboard/i18n/locale/it/search.json      |  22 +
 .../dashboard/i18n/locale/ja/report.json      |  15 +
 .../dashboard/i18n/locale/ja/search.json      |  22 +
 .../dashboard/i18n/locale/ka/report.json      |  15 +
 .../dashboard/i18n/locale/ka/search.json      |  22 +
 .../dashboard/i18n/locale/ko/report.json      |  15 +
 .../dashboard/i18n/locale/ko/search.json      |  22 +
 .../dashboard/i18n/locale/lt/report.json      |  15 +
 .../dashboard/i18n/locale/lt/search.json      |  22 +
 .../i18n/locale/lv/attributesMgmt.json        |   2 +-
 .../dashboard/i18n/locale/lv/report.json      |  15 +
 .../dashboard/i18n/locale/lv/search.json      |  22 +
 .../dashboard/i18n/locale/lv/signup.json      |   6 +-
 .../dashboard/i18n/locale/ml/report.json      |  15 +
 .../dashboard/i18n/locale/ml/search.json      |  22 +
 .../dashboard/i18n/locale/ms/report.json      |  15 +
 .../dashboard/i18n/locale/ms/search.json      |  22 +
 .../dashboard/i18n/locale/ne/report.json      |  15 +
 .../dashboard/i18n/locale/ne/search.json      |  22 +
 .../dashboard/i18n/locale/nl/report.json      |  15 +
 .../dashboard/i18n/locale/nl/search.json      |  22 +
 .../dashboard/i18n/locale/no/report.json      |  15 +
 .../dashboard/i18n/locale/no/search.json      |  22 +
 .../dashboard/i18n/locale/pl/report.json      |  15 +
 .../dashboard/i18n/locale/pl/search.json      |  22 +
 .../dashboard/i18n/locale/pt/report.json      |  15 +
 .../dashboard/i18n/locale/pt/search.json      |  22 +
 .../dashboard/i18n/locale/pt_BR/report.json   |  15 +
 .../dashboard/i18n/locale/pt_BR/search.json   |  22 +
 .../dashboard/i18n/locale/ro/report.json      |  15 +
 .../dashboard/i18n/locale/ro/search.json      |  22 +
 .../dashboard/i18n/locale/ru/report.json      |  15 +
 .../dashboard/i18n/locale/ru/search.json      |  22 +
 .../dashboard/i18n/locale/sk/report.json      |  15 +
 .../dashboard/i18n/locale/sk/search.json      |  22 +
 .../dashboard/i18n/locale/sr/report.json      |  15 +
 .../dashboard/i18n/locale/sr/search.json      |  22 +
 .../dashboard/i18n/locale/sv/report.json      |  15 +
 .../dashboard/i18n/locale/sv/search.json      |  22 +
 .../dashboard/i18n/locale/ta/report.json      |  15 +
 .../dashboard/i18n/locale/ta/search.json      |  22 +
 .../dashboard/i18n/locale/th/report.json      |  15 +
 .../dashboard/i18n/locale/th/search.json      |  22 +
 .../dashboard/i18n/locale/tr/report.json      |  15 +
 .../dashboard/i18n/locale/tr/search.json      |  22 +
 .../dashboard/i18n/locale/uk/report.json      |  15 +
 .../dashboard/i18n/locale/uk/search.json      |  22 +
 .../dashboard/i18n/locale/ur/report.json      |  15 +
 .../dashboard/i18n/locale/ur/search.json      |  22 +
 .../dashboard/i18n/locale/ur_IN/report.json   |  15 +
 .../dashboard/i18n/locale/ur_IN/search.json   |  22 +
 .../dashboard/i18n/locale/vi/report.json      |  15 +
 .../dashboard/i18n/locale/vi/search.json      |  22 +
 .../dashboard/i18n/locale/zh_CN/report.json   |  15 +
 .../dashboard/i18n/locale/zh_CN/search.json   |  22 +
 .../dashboard/i18n/locale/zh_TW/report.json   |  15 +
 .../dashboard/i18n/locale/zh_TW/search.json   |  22 +
 app/javascript/survey/i18n/locale/hy.json     |  19 +
 app/javascript/widget/i18n/locale/hy.json     |  97 +++
 config/locales/ar.yml                         |   2 +-
 config/locales/bg.yml                         |   2 +-
 config/locales/ca.yml                         |   2 +-
 config/locales/cs.yml                         |   2 +-
 config/locales/da.yml                         |   2 +-
 config/locales/de.yml                         |   2 +-
 config/locales/devise.hy.yml                  |  61 ++
 config/locales/el.yml                         |   2 +-
 config/locales/es.yml                         |   2 +-
 config/locales/fa.yml                         |   2 +-
 config/locales/fi.yml                         |   2 +-
 config/locales/fr.yml                         |   2 +-
 config/locales/he.yml                         |   2 +-
 config/locales/hi.yml                         |   2 +-
 config/locales/hu.yml                         |   2 +-
 config/locales/hy.yml                         | 183 +++++
 config/locales/id.yml                         |   2 +-
 config/locales/is.yml                         |   2 +-
 config/locales/it.yml                         |   2 +-
 config/locales/ja.yml                         |   2 +-
 config/locales/ka.yml                         |   2 +-
 config/locales/ko.yml                         |   2 +-
 config/locales/lt.yml                         |   2 +-
 config/locales/lv.yml                         |   2 +-
 config/locales/ml.yml                         |   2 +-
 config/locales/ms.yml                         |   2 +-
 config/locales/ne.yml                         |   2 +-
 config/locales/nl.yml                         |   2 +-
 config/locales/no.yml                         |   2 +-
 config/locales/pl.yml                         |   2 +-
 config/locales/pt.yml                         |   2 +-
 config/locales/pt_BR.yml                      |   2 +-
 config/locales/ro.yml                         |   2 +-
 config/locales/ru.yml                         |   2 +-
 config/locales/sk.yml                         |   2 +-
 config/locales/sr.yml                         |   2 +-
 config/locales/sv.yml                         |   2 +-
 config/locales/ta.yml                         |   2 +-
 config/locales/th.yml                         |   2 +-
 config/locales/tr.yml                         |   2 +-
 config/locales/uk.yml                         |   2 +-
 config/locales/ur.yml                         |   2 +-
 config/locales/ur_IN.yml                      |   2 +-
 config/locales/vi.yml                         |   2 +-
 config/locales/zh_CN.yml                      |   2 +-
 config/locales/zh_TW.yml                      |   2 +-
 172 files changed, 6237 insertions(+), 70 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/advancedFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/agentBots.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/automation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/campaign.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/contactFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/csatMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/emoji.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/helpCenter.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/macros.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/teamsSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/is/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ka/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lt/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ms/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/search.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/search.json
 create mode 100644 app/javascript/survey/i18n/locale/hy.json
 create mode 100644 app/javascript/widget/i18n/locale/hy.json
 create mode 100644 config/locales/devise.hy.yml
 create mode 100644 config/locales/hy.yml

diff --git a/app/javascript/dashboard/i18n/locale/ar/report.json b/app/javascript/dashboard/i18n/locale/ar/report.json
index 1e59887c0..24b171aa8 100644
--- a/app/javascript/dashboard/i18n/locale/ar/report.json
+++ b/app/javascript/dashboard/i18n/locale/ar/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "بدون حضور",
       "UNASSIGNED": "غير مسند"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "المحادثات من قبل الوكلاء",
       "LOADING_MESSAGE": "جاري تحميل مقاييس الوكيل...",
@@ -443,5 +449,14 @@
       "BUSY": "مشغول",
       "OFFLINE": "غير متصل"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/search.json b/app/javascript/dashboard/i18n/locale/ar/search.json
new file mode 100644
index 000000000..ddbe8a32f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "الكل",
+      "CONTACTS": "جهات الاتصال",
+      "CONVERSATIONS": "المحادثات",
+      "MESSAGES": "الرسائل"
+    },
+    "SECTION": {
+      "CONTACTS": "جهات الاتصال",
+      "CONVERSATIONS": "المحادثات",
+      "MESSAGES": "الرسائل"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "رد آلي",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/report.json b/app/javascript/dashboard/i18n/locale/bg/report.json
index 34116062a..52dfbc751 100644
--- a/app/javascript/dashboard/i18n/locale/bg/report.json
+++ b/app/javascript/dashboard/i18n/locale/bg/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Неназначен"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/search.json b/app/javascript/dashboard/i18n/locale/bg/search.json
new file mode 100644
index 000000000..318130836
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Всички",
+      "CONTACTS": "Контакти",
+      "CONVERSATIONS": "Разговори",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Контакти",
+      "CONVERSATIONS": "Разговори",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Бот",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/report.json b/app/javascript/dashboard/i18n/locale/ca/report.json
index 831891c2b..e36cedb57 100644
--- a/app/javascript/dashboard/i18n/locale/ca/report.json
+++ b/app/javascript/dashboard/i18n/locale/ca/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Sense assignar"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Ocupat",
       "OFFLINE": "Fora de línia"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/search.json b/app/javascript/dashboard/i18n/locale/ca/search.json
new file mode 100644
index 000000000..7c16113e9
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Totes",
+      "CONTACTS": "Contactes",
+      "CONVERSATIONS": "Converses",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contactes",
+      "CONVERSATIONS": "Converses",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/report.json b/app/javascript/dashboard/i18n/locale/cs/report.json
index 99037060b..01d2126c8 100644
--- a/app/javascript/dashboard/i18n/locale/cs/report.json
+++ b/app/javascript/dashboard/i18n/locale/cs/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Nepřiřazeno"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Zaneprázdněn",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/search.json b/app/javascript/dashboard/i18n/locale/cs/search.json
new file mode 100644
index 000000000..e515bb140
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Vše",
+      "CONTACTS": "Kontakty",
+      "CONVERSATIONS": "Konverzace",
+      "MESSAGES": "Zprávy"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakty",
+      "CONVERSATIONS": "Konverzace",
+      "MESSAGES": "Zprávy"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/report.json b/app/javascript/dashboard/i18n/locale/da/report.json
index 18f1bd6f8..6198d779d 100644
--- a/app/javascript/dashboard/i18n/locale/da/report.json
+++ b/app/javascript/dashboard/i18n/locale/da/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattet",
       "UNASSIGNED": "Ikke Tildelt"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Samtaler af agenter",
       "LOADING_MESSAGE": "Indlæser agent målinger...",
@@ -443,5 +449,14 @@
       "BUSY": "Optaget",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/search.json b/app/javascript/dashboard/i18n/locale/da/search.json
new file mode 100644
index 000000000..35a3d3ab0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Alle",
+      "CONTACTS": "Kontakter",
+      "CONVERSATIONS": "Samtaler",
+      "MESSAGES": "Beskeder"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakter",
+      "CONVERSATIONS": "Samtaler",
+      "MESSAGES": "Beskeder"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index 695f29093..6fc2357e2 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unbeaufsichtigt",
       "UNASSIGNED": "Nicht zugewiesen"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Konversationen von Agenten",
       "LOADING_MESSAGE": "Agent-Daten werden geladen...",
@@ -443,5 +449,14 @@
       "BUSY": "Beschäftigt",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/search.json b/app/javascript/dashboard/i18n/locale/de/search.json
new file mode 100644
index 000000000..ea4ff12d7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Alle",
+      "CONTACTS": "Kontakte",
+      "CONVERSATIONS": "Gespräche",
+      "MESSAGES": "Nachrichten"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakte",
+      "CONVERSATIONS": "Gespräche",
+      "MESSAGES": "Nachrichten"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/report.json b/app/javascript/dashboard/i18n/locale/el/report.json
index 788956e43..eab022657 100644
--- a/app/javascript/dashboard/i18n/locale/el/report.json
+++ b/app/javascript/dashboard/i18n/locale/el/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Χωρίς Παρακολούθηση",
       "UNASSIGNED": "Χωρίς Αντιστοίχιση"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Συζητήσεις αντιπροσώπων",
       "LOADING_MESSAGE": "Φόρτωση μετρήσεων πράκτορα...",
@@ -443,5 +449,14 @@
       "BUSY": "Απασχολημένος",
       "OFFLINE": "Εκτός"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/search.json b/app/javascript/dashboard/i18n/locale/el/search.json
new file mode 100644
index 000000000..61247e0bf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Όλες",
+      "CONTACTS": "Επαφές",
+      "CONVERSATIONS": "Συζητήσεις",
+      "MESSAGES": "Μηνύματα"
+    },
+    "SECTION": {
+      "CONTACTS": "Επαφές",
+      "CONVERSATIONS": "Συζητήσεις",
+      "MESSAGES": "Μηνύματα"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index af1f16891..c645f7285 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Desatendido",
       "UNASSIGNED": "Sin asignar"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversaciones por agentes",
       "LOADING_MESSAGE": "Cargando métricas del agente...",
@@ -443,5 +449,14 @@
       "BUSY": "Ocupado",
       "OFFLINE": "Fuera de línea"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/search.json b/app/javascript/dashboard/i18n/locale/es/search.json
new file mode 100644
index 000000000..cb204ce9f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Todos",
+      "CONTACTS": "Contactos",
+      "CONVERSATIONS": "Conversaciones",
+      "MESSAGES": "Mensajes"
+    },
+    "SECTION": {
+      "CONTACTS": "Contactos",
+      "CONVERSATIONS": "Conversaciones",
+      "MESSAGES": "Mensajes"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/report.json b/app/javascript/dashboard/i18n/locale/fa/report.json
index 165e3ed7e..01e524b4c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/report.json
+++ b/app/javascript/dashboard/i18n/locale/fa/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "بی سرپرست",
       "UNASSIGNED": "تخصیص داده نشده"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "ترافیک گفتگو",
+      "NO_CONVERSATIONS": "بدون هیچ گفتگویی",
+      "CONVERSATION": "%{count} گفتگو",
+      "CONVERSATIONS": "%{count} گفتگو"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "گفتگوهای ایجنت ها",
       "LOADING_MESSAGE": "در حال بارگیری معیارهای ایجنت...",
@@ -443,5 +449,14 @@
       "BUSY": "مشغول",
       "OFFLINE": "آفلاین"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "یک‌شنبه",
+    "MONDAY": "دوشنبه",
+    "TUESDAY": "سه‌شنبه",
+    "WEDNESDAY": "چهارشنبه",
+    "THURSDAY": "پنج‌شنبه",
+    "FRIDAY": "جمعه",
+    "SATURDAY": "شنبه"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/search.json b/app/javascript/dashboard/i18n/locale/fa/search.json
new file mode 100644
index 000000000..610a25313
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "همه",
+      "CONTACTS": "مخاطبین",
+      "CONVERSATIONS": "گفتگوها",
+      "MESSAGES": "پیام‌ها"
+    },
+    "SECTION": {
+      "CONTACTS": "مخاطبین",
+      "CONVERSATIONS": "گفتگوها",
+      "MESSAGES": "پیام‌ها"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "ربات",
+    "READ_MORE": "ادامه مطلب",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/report.json b/app/javascript/dashboard/i18n/locale/fi/report.json
index b2b84affe..889cd89a1 100644
--- a/app/javascript/dashboard/i18n/locale/fi/report.json
+++ b/app/javascript/dashboard/i18n/locale/fi/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Osoittamaton"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Kiireinen",
       "OFFLINE": "Poissa"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/search.json b/app/javascript/dashboard/i18n/locale/fi/search.json
new file mode 100644
index 000000000..f53e59699
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Kaikki",
+      "CONTACTS": "Yhteystiedot",
+      "CONVERSATIONS": "Keskustelut",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Yhteystiedot",
+      "CONVERSATIONS": "Keskustelut",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Botti",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/report.json b/app/javascript/dashboard/i18n/locale/fr/report.json
index 96987bdcb..fae704ac4 100644
--- a/app/javascript/dashboard/i18n/locale/fr/report.json
+++ b/app/javascript/dashboard/i18n/locale/fr/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Non assigné"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Occupé(e)",
       "OFFLINE": "Hors-ligne"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/search.json b/app/javascript/dashboard/i18n/locale/fr/search.json
new file mode 100644
index 000000000..5ff8321e4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Tous",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/chatlist.json b/app/javascript/dashboard/i18n/locale/he/chatlist.json
index 2beb34de9..32a42b910 100644
--- a/app/javascript/dashboard/i18n/locale/he/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/he/chatlist.json
@@ -7,10 +7,10 @@
       "404": "אין שיחות פעילות בקבוצה הזו."
     },
     "TAB_HEADING": "שיחות",
-    "MENTION_HEADING": "אִזְכּוּרים",
-    "UNATTENDED_HEADING": "Unattended",
+    "MENTION_HEADING": "תיוגים",
+    "UNATTENDED_HEADING": "לא מתוכנן",
     "SEARCH": {
-      "INPUT": "חפש אנשים, צ'אטים, תגובות שמורות .."
+      "INPUT": "חפש אנשים, שיחות, תגובות שמורות .."
     },
     "FILTER_ALL": "הכל",
     "ASSIGNEE_TYPE_TABS": {
@@ -60,12 +60,12 @@
     "REPLY_TO_TWEET": "הגב לציוץ זה",
     "LINK_TO_STORY": "מעבר לסטורי באינסטגרם",
     "SENT": "נשלח בהצלחה",
-    "READ": "Read successfully",
-    "DELIVERED": "Delivered successfully",
+    "READ": "נקרא בהצלחה",
+    "DELIVERED": "התקבל בהצלחה",
     "NO_MESSAGES": "אין הודעות",
     "NO_CONTENT": "אין תוכן זמין",
     "HIDE_QUOTED_TEXT": "הסתר טקסט מצוטט",
     "SHOW_QUOTED_TEXT": "הצג טקסט מצוטט",
-    "MESSAGE_READ": "קרא"
+    "MESSAGE_READ": "נקרא"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index cabbebca9..ce5087118 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -9,16 +9,16 @@
     "LOCATION": "מיקום",
     "BROWSER_LANGUAGE": "שפת דפדפן",
     "CONVERSATION_TITLE": "פרטי שיחה",
-    "VIEW_PROFILE": "צפה בפרופיל",
+    "VIEW_PROFILE": "הצג פרופיל",
     "BROWSER": "דפדפן",
     "OS": "מערכת הפעלה",
-    "INITIATED_FROM": "יזום מי",
-    "INITIATED_AT": "יזם ב",
+    "INITIATED_FROM": "נוצר מ",
+    "INITIATED_AT": "נוצר ב",
     "IP_ADDRESS": "כתובת IP",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "נוצר",
     "NEW_MESSAGE": "הודעה חדשה",
     "CONVERSATIONS": {
-      "NO_RECORDS_FOUND": "לא היו שיחות קודמות המשויכות לאיש קשר זה.",
+      "NO_RECORDS_FOUND": "לא קיימות שיחות קודמות המשויכות לאיש קשר זה.",
       "TITLE": "שיחות קודמות"
     },
     "LABELS": {
@@ -39,13 +39,13 @@
     "MERGE_CONTACT": "מזג אנשי קשר",
     "CONTACT_ACTIONS": "פעולות אנשי קשר",
     "MUTE_CONTACT": "השתק שיחה",
-    "UNMUTE_CONTACT": "הסר השתקת שיחה",
+    "UNMUTE_CONTACT": "בטל השתקת שיחה",
     "MUTED_SUCCESS": "שיחה זו מושתקת למשך 6 שעות",
-    "UNMUTED_SUCCESS": "השיחה הזו אינה מושתקת",
+    "UNMUTED_SUCCESS": "השיחה זו אינה מושתקת",
     "SEND_TRANSCRIPT": "שלח תמלול",
     "EDIT_LABEL": "ערוך",
     "SIDEBAR_SECTIONS": {
-      "CUSTOM_ATTRIBUTES": "תכונות מותאמות אישית",
+      "CUSTOM_ATTRIBUTES": "שדות מותאמים אישית",
       "CONTACT_LABELS": "תגיות אנשי קשר",
       "PREVIOUS_CONVERSATIONS": "שיחות קודמות"
     }
@@ -53,21 +53,21 @@
   "EDIT_CONTACT": {
     "BUTTON_LABEL": "ערוך איש קשר",
     "TITLE": "ערוך איש קשר",
-    "DESC": "ערוך את פרטי הקשר"
+    "DESC": "ערוך את פרטי איש הקשר"
   },
   "CREATE_CONTACT": {
     "BUTTON_LABEL": "איש קשר חדש",
     "TITLE": "צור איש קשר חדש",
-    "DESC": "הוסף פרטי מידע בסיסיים על איש הקשר."
+    "DESC": "הוסף מידע בסיסי לאיש הקשר."
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "יבא",
+    "BUTTON_LABEL": "ייבוא",
     "TITLE": "ייבא אנשי קשר",
     "DESC": "ייבא אנשי קשר באמצעות קובץ CSV.",
     "DOWNLOAD_LABEL": "הורד קובץ csv לדוגמה.",
     "FORM": {
       "LABEL": "קובץ CSV",
-      "SUBMIT": "יבא",
+      "SUBMIT": "ייבוא",
       "CANCEL": "ביטול"
     },
     "SUCCESS_MESSAGE": "אנשי הקשר נשמרו בהצלחה",
@@ -76,7 +76,7 @@
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "אשר מחיקה",
-      "MESSAGE": "אתה בטוח שתרצה למחוק את ההערה הזו?",
+      "MESSAGE": "אתה בטוח שברצונך למחוק הערה זו?",
       "YES": "כן, מחק",
       "NO": "לא, השאר"
     }
@@ -153,8 +153,8 @@
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "תמונת פרופיל נמחקה",
+        "ERROR_MESSAGE": "מחיקת התמונה נכשלה. נסה שנית מאוחר יותר."
       }
     },
     "SUCCESS_MESSAGE": "איש הקשר נשמר בהצלחה",
diff --git a/app/javascript/dashboard/i18n/locale/he/report.json b/app/javascript/dashboard/i18n/locale/he/report.json
index 93055d7f2..58b31aac9 100644
--- a/app/javascript/dashboard/i18n/locale/he/report.json
+++ b/app/javascript/dashboard/i18n/locale/he/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "לא הוקצתה"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "עסוק",
       "OFFLINE": "לא מחובר"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/search.json b/app/javascript/dashboard/i18n/locale/he/search.json
new file mode 100644
index 000000000..3247a02fd
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "הכל",
+      "CONTACTS": "איש קשר",
+      "CONVERSATIONS": "שיחות",
+      "MESSAGES": "הודעות"
+    },
+    "SECTION": {
+      "CONTACTS": "איש קשר",
+      "CONVERSATIONS": "שיחות",
+      "MESSAGES": "הודעות"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "בוט",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/report.json b/app/javascript/dashboard/i18n/locale/hi/report.json
index 0bd9b544d..48dcccc2b 100644
--- a/app/javascript/dashboard/i18n/locale/hi/report.json
+++ b/app/javascript/dashboard/i18n/locale/hi/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/search.json b/app/javascript/dashboard/i18n/locale/hi/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/report.json b/app/javascript/dashboard/i18n/locale/hu/report.json
index 3a52f511a..36ec4fe17 100644
--- a/app/javascript/dashboard/i18n/locale/hu/report.json
+++ b/app/javascript/dashboard/i18n/locale/hu/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Gazdátlan"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Foglalt",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/search.json b/app/javascript/dashboard/i18n/locale/hu/search.json
new file mode 100644
index 000000000..094fc6f60
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Mind",
+      "CONTACTS": "Kontaktok",
+      "CONVERSATIONS": "Beszélgetések",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontaktok",
+      "CONVERSATIONS": "Beszélgetések",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hy/advancedFilters.json
new file mode 100644
index 000000000..46a573c42
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/advancedFilters.json
@@ -0,0 +1,93 @@
+{
+  "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_less_than": "Is lesser than",
+      "days_before": "Is x days before"
+    },
+    "ATTRIBUTE_LABELS": {
+      "TRUE": "True",
+      "FALSE": "False"
+    },
+    "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",
+      "CREATED_AT": "Created At",
+      "LAST_ACTIVITY": "Last Activity"
+    },
+    "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/hy/agentBots.json b/app/javascript/dashboard/i18n/locale/hy/agentBots.json
new file mode 100644
index 000000000..5403bb18c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/agentBots.json
@@ -0,0 +1,73 @@
+{
+  "AGENT_BOTS": {
+    "HEADER": "Bots",
+    "LOADING_EDITOR": "Loading Editor...",
+    "HEADER_BTN_TXT": "Add Bot Configuration",
+    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent bots allows you to automate the conversations</p>",
+    "CSML_BOT_EDITOR": {
+      "NAME": {
+        "LABEL": "Bot Name",
+        "PLACEHOLDER": "Give your bot a name",
+        "ERROR": "Bot name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Bot Description",
+        "PLACEHOLDER": "What does this bot do?"
+      },
+      "BOT_CONFIG": {
+        "ERROR": "Please enter your CSML bot configuration above",
+        "API_ERROR": "Your CSML configuration is invalid, please fix it and try again."
+      },
+      "SUBMIT": "Validate and save"
+    },
+    "BOT_CONFIGURATION": {
+      "TITLE": "Select an agent bot",
+      "DESC": "You can set an agent bot from the list to this inbox. The bot can initially handle the conversation and transfer it to an agent when needed.",
+      "SUBMIT": "Update",
+      "DISCONNECT": "Disconnect Bot",
+      "SUCCESS_MESSAGE": "Successfully updated the agent bot",
+      "DISCONNECTED_SUCCESS_MESSAGE": "Successfully disconnected the agent bot",
+      "ERROR_MESSAGE": "Could not update the agent bot, please try again later",
+      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot, please try again later",
+      "SELECT_PLACEHOLDER": "Select Bot"
+    },
+    "ADD": {
+      "TITLE": "Configure new bot",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Bot added successfully",
+        "ERROR_MESSAGE": "Could not add bot, Please try again later"
+      }
+    },
+    "LIST": {
+      "404": "No Bots found, you can create a bot by clicking the 'Configure new bot' Button ↗",
+      "LOADING": "Fetching Bots...",
+      "TYPE": "Bot Type"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "TITLE": "Delete Bot",
+      "SUBMIT": "Delete",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
+      "API": {
+        "SUCCESS_MESSAGE": "Bot deleted successfully",
+        "ERROR_MESSAGE": "Could not able to delete bot, Please try again later"
+      }
+    },
+    "EDIT": {
+      "BUTTON_TEXT": "Edit",
+      "LOADING": "Fetching Bots...",
+      "TITLE": "Edit Bot",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "API": {
+        "SUCCESS_MESSAGE": "Bot updated successfully",
+        "ERROR_MESSAGE": "Could not update bot, Please try again later"
+      }
+    },
+    "TYPES": {
+      "WEBHOOK": "Webhook Bot",
+      "CSML": "CSML Bot"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hy/agentMgmt.json
new file mode 100644
index 000000000..0f965c717
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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/hy/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
new file mode 100644
index 000000000..2a9ea7de3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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 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/hy/automation.json b/app/javascript/dashboard/i18n/locale/hy/automation.json
new file mode 100644
index 000000000..469df1c24
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/automation.json
@@ -0,0 +1,118 @@
+{
+  "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>",
+    "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": "Update",
+      "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"
+    },
+    "CONDITION": {
+      "DELETE_MESSAGE": "You need to have atleast one condition to save",
+      "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes",
+      "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes"
+    },
+    "ACTION": {
+      "DELETE_MESSAGE": "You need to have atleast one action to save",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
+    },
+    "TOGGLE": {
+      "ACTIVATION_TITLE": "Activate Automation Rule",
+      "DEACTIVATION_TITLE": "Deactivate Automation Rule",
+      "ACTIVATION_DESCRIPTION": "This action will activate the automation rule '{automationName}'. Are you sure you want to proceed?",
+      "DEACTIVATION_DESCRIPTION": "This action will deactivate the automation rule '{automationName}'. Are you sure you want to proceed?",
+      "ACTIVATION_SUCCESFUL": "Automation Rule Activated Successfully",
+      "DEACTIVATION_SUCCESFUL": "Automation Rule Deactivated Successfully",
+      "ACTIVATION_ERROR": "Could not Activate Automation, Please try again later",
+      "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
+      "CONFIRMATION_LABEL": "Yes",
+      "CANCEL_LABEL": "No"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Uploading...",
+      "LABEL_UPLOADED": "Successfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/bulkActions.json b/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
new file mode 100644
index 000000000..d5145f1bb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/bulkActions.json
@@ -0,0 +1,40 @@
+{
+  "BULK_ACTION": {
+    "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+    "AGENT_SELECT_LABEL": "Select Agent",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
+    "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
+    "GO_BACK_LABEL": "Go back",
+    "ASSIGN_LABEL": "Assign",
+    "YES": "Yes",
+    "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+    "ASSIGN_TEAM_TOOLTIP": "Assign team",
+    "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
+    "ASSIGN_FAILED": "Failed to assign conversations, please try again",
+    "RESOLVE_SUCCESFUL": "Conversations resolved successfully",
+    "RESOLVE_FAILED": "Failed to resolve conversations, please try again",
+    "ALL_CONVERSATIONS_SELECTED_ALERT": "Conversations visible on this page are only selected.",
+    "AGENT_LIST_LOADING": "Loading Agents",
+    "UPDATE": {
+      "CHANGE_STATUS": "Change status",
+      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply",
+      "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
+      "UPDATE_FAILED": "Failed to update conversations, please try again"
+    },
+    "LABELS": {
+      "ASSIGN_LABELS": "Assign Labels",
+      "NO_LABELS_FOUND": "No labels found for",
+      "ASSIGN_SELECTED_LABELS": "Assign selected labels",
+      "ASSIGN_SUCCESFUL": "Labels assigned successfully",
+      "ASSIGN_FAILED": "Failed to assign labels, please try again"
+    },
+    "TEAMS": {
+      "TEAM_SELECT_LABEL": "Select Team",
+      "NONE": "None",
+      "NO_TEAMS_AVAILABLE": "There are no teams added to this account yet.",
+      "ASSIGN_SELECTED_TEAMS": "Assign selected team",
+      "ASSIGN_SUCCESFUL": "Teams assiged successfully",
+      "ASSIGN_FAILED": "Failed to assign team, please try again"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/campaign.json b/app/javascript/dashboard/i18n/locale/hy/campaign.json
new file mode 100644
index 000000000..bbcc463ee
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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/hy/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hy/cannedMgmt.json
new file mode 100644
index 000000000..9c14f5a52
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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/hy/chatlist.json b/app/javascript/dashboard/i18n/locale/hy/chatlist.json
new file mode 100644
index 000000000..b96cfb976
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/chatlist.json
@@ -0,0 +1,71 @@
+{
+  "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",
+    "UNATTENDED_HEADING": "Unattended",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "FILTER_ALL": "All",
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Unassigned",
+      "all": "All"
+    },
+    "CHAT_STATUS_FILTER_ITEMS": {
+      "open": {
+        "TEXT": "Open"
+      },
+      "resolved": {
+        "TEXT": "Resolved"
+      },
+      "pending": {
+        "TEXT": "Pending"
+      },
+      "snoozed": {
+        "TEXT": "Snoozed"
+      },
+      "all": {
+        "TEXT": "All"
+      }
+    },
+    "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",
+    "LINK_TO_STORY": "Go to instagram story",
+    "SENT": "Sent successfully",
+    "READ": "Read successfully",
+    "DELIVERED": "Delivered successfully",
+    "NO_MESSAGES": "No Messages",
+    "NO_CONTENT": "No content available",
+    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
new file mode 100644
index 000000000..14ab0032d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -0,0 +1,349 @@
+{
+  "CONTACT_PANEL": {
+    "NOT_AVAILABLE": "Not Available",
+    "EMAIL_ADDRESS": "Email Address",
+    "PHONE_NUMBER": "Phone number",
+    "IDENTIFIER": "Identifier",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COMPANY": "Company",
+    "LOCATION": "Location",
+    "BROWSER_LANGUAGE": "Browser Language",
+    "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",
+    "CREATED_AT_LABEL": "Created",
+    "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_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirm Deletion",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "No, Keep it"
+    }
+  },
+  "DELETE_CONTACT": {
+    "BUTTON_LABEL": "Delete Contact",
+    "TITLE": "Delete contact",
+    "DESC": "Delete contact details",
+    "CONFIRM": {
+      "TITLE": "Confirm Deletion",
+      "MESSAGE": "Are you sure to delete ",
+      "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.",
+        "ERROR": "Please enter a valid email address."
+      },
+      "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"
+        }
+      }
+    },
+    "DELETE_AVATAR": {
+      "API": {
+        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
+        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+      }
+    },
+    "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",
+        "CREATED_AT": "Created At",
+        "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/hy/contactFilters.json b/app/javascript/dashboard/i18n/locale/hy/contactFilters.json
new file mode 100644
index 000000000..3f84a8476
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/contactFilters.json
@@ -0,0 +1,50 @@
+{
+    "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",
+            "days_before": "Is x days before"
+        },
+        "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",
+            "CREATED_AT": "Created At",
+            "LAST_ACTIVITY": "Last Activity",
+            "REFERER_LINK": "Referrer link"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
+        }
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/conversation.json b/app/javascript/dashboard/i18n/locale/hy/conversation.json
new file mode 100644
index 000000000..f98a3cdc0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/conversation.json
@@ -0,0 +1,282 @@
+{
+  "CONVERSATION": {
+    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "CSAT_REPLY_MESSAGE": "Please rate the conversation",
+    "404": "Sorry, we cannot find the conversation. Please try again",
+    "SWITCH_VIEW_LAYOUT": "Switch the layout",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
+    "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",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
+    "SAVE_CONTACT": "Save",
+    "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",
+    "CARD": {
+      "SHOW_LABELS": "Show labels",
+      "HIDE_LABELS": "Hide labels"
+    },
+    "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"
+      }
+    },
+    "CARD_CONTEXT_MENU": {
+      "PENDING": "Mark as pending",
+      "RESOLVED": "Mark as resolved",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "REOPEN": "Reopen conversation",
+      "SNOOZE": {
+        "TITLE": "Snooze",
+        "NEXT_REPLY": "Until next reply",
+        "TOMORROW": "Until tomorrow",
+        "NEXT_WEEK": "Until next week"
+      },
+      "ASSIGN_AGENT": "Assign agent",
+      "ASSIGN_LABEL": "Assign label",
+      "AGENTS_LOADING": "Loading agents...",
+      "ASSIGN_TEAM": "Assign team",
+      "API": {
+        "AGENT_ASSIGNMENT": {
+          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
+          "FAILED": "Couldn't assign agent. Please try again."
+        },
+        "LABEL_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign label. Please try again."
+        },
+        "TEAM_ASSIGNMENT": {
+          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
+          "FAILED": "Couldn't assign team. Please try again."
+        }
+      }
+    },
+    "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",
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
+      "CLICK_HERE": "Click here to update"
+    },
+    "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",
+      "TIP_AUDIORECORDER_ICON": "Record audio",
+      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
+      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
+      "DRAG_DROP": "Drag and drop here to attach",
+      "START_AUDIO_RECORDING": "Start audio recording",
+      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "": "",
+      "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"
+        }
+      },
+      "UNDEFINED_VARIABLES": {
+        "TITLE": "Undefined variables",
+        "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
+        "CONFIRM": {
+          "YES": "Send",
+          "CANCEL": "Cancel"
+        }
+      }
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_STATUS_FAILED": "Conversation status change failed",
+    "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_AGENT_FAILED": "Assignee change failed",
+    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
+    "ASSIGN_LABEL_FAILED": "Label assignment failed",
+    "CHANGE_TEAM": "Conversation team changed",
+    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB 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",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "TRANSLATE": "Translate"
+    }
+  },
+  "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",
+      "MACROS": "Macros"
+    }
+  },
+  "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": {
+    "FROM": "From",
+    "TO": "To",
+    "BCC": "Bcc",
+    "CC": "Cc",
+    "SUBJECT": "Subject"
+  },
+  "CONVERSATION_PARTICIPANTS": {
+    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_TITLE": "Conversation participants",
+    "NO_RECORDS_FOUND": "No results found",
+    "ADD_PARTICIPANTS": "Select participants",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
+    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "WATCH_CONVERSATION": "Join conversation",
+    "YOU_ARE_WATCHING": "You are participating",
+    "API": {
+      "ERROR_MESSAGE": "Could not update, try again!",
+      "SUCCESS_MESSAGE": "Participants updated!"
+    }
+  },
+  "TRANSLATE_MODAL": {
+    "TITLE": "View translated content",
+    "DESC": "You can view the translated content in each langauge.",
+    "ORIGINAL_CONTENT": "Original Content",
+    "TRANSLATED_CONTENT": "Translated Content",
+    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/csatMgmt.json b/app/javascript/dashboard/i18n/locale/hy/csatMgmt.json
new file mode 100644
index 000000000..d7d2efc2a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/csatMgmt.json
@@ -0,0 +1,6 @@
+{
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "PLACEHOLDER": "Tell us more..."
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/emoji.json b/app/javascript/dashboard/i18n/locale/hy/emoji.json
new file mode 100644
index 000000000..fd81268fb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/emoji.json
@@ -0,0 +1,6 @@
+{
+  "EMOJI": {
+    "PLACEHOLDER": "Search emojis",
+    "NOT_FOUND": "No emoji match your search"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
new file mode 100644
index 000000000..367b35b1c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -0,0 +1,145 @@
+{
+  "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",
+        "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.",
+    "LEARN_MORE": "Learn more"
+  },
+  "FORMS": {
+    "MULTISELECT": {
+      "ENTER_TO_SELECT": "Press enter to select",
+      "ENTER_TO_REMOVE": "Press enter to remove",
+      "SELECT_ONE": "Select one",
+      "SELECT": "Select"
+    }
+  },
+  "NOTIFICATIONS_PAGE": {
+    "HEADER": "Notifications",
+    "MARK_ALL_DONE": "Mark All Done",
+    "DELETE_TITLE": "deleted",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Unread Notifications",
+      "ALL_NOTIFICATIONS": "View all notifications",
+      "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
+      "EMPTY_MESSAGE": "You have no unread notifications"
+    },
+    "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",
+      "participating_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_CONVERSATION_REPORTS": "Go to Conversation Reports",
+      "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"
+    }
+  },
+  "DASHBOARD_APPS": {
+    "LOADING_MESSAGE": "Loading Dashboard App..."
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/helpCenter.json b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
new file mode 100644
index 000000000..621a16ae8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
@@ -0,0 +1,422 @@
+{
+  "HELP_CENTER": {
+    "HEADER": {
+      "FILTER": "Filter by",
+      "SORT": "Sort by",
+      "SETTINGS_BUTTON": "Settings",
+      "NEW_BUTTON": "New Article",
+      "DROPDOWN_OPTIONS": {
+        "PUBLISHED": "Published",
+        "DRAFT": "Draft",
+        "ARCHIVED": "Archived"
+      },
+      "TITLES": {
+        "ALL_ARTICLES": "All Articles",
+        "MINE": "My Articles",
+        "DRAFT": "Draft Articles",
+        "ARCHIVED": "Archived Articles"
+      }
+    },
+    "EDIT_HEADER": {
+      "ALL_ARTICLES": "All Articles",
+      "PUBLISH_BUTTON": "Publish",
+      "MOVE_TO_ARCHIVE_BUTTON": "Move to archived",
+      "PREVIEW": "Preview",
+      "ADD_TRANSLATION": "Add translation",
+      "OPEN_SIDEBAR": "Open sidebar",
+      "CLOSE_SIDEBAR": "Close sidebar",
+      "SAVING": "Saving...",
+      "SAVED": "Saved"
+    },
+    "ARTICLE_EDITOR": {
+      "IMAGE_UPLOAD": {
+        "TITLE": "Upload image",
+        "UPLOADING": "Uploading...",
+        "SUCCESS": "Image uploaded successfully",
+        "ERROR": "Error while uploading image",
+        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
+        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
+        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+      }
+    },
+    "ARTICLE_SETTINGS": {
+      "TITLE": "Article Settings",
+      "FORM": {
+        "CATEGORY": {
+          "LABEL": "Category",
+          "TITLE": "Select category",
+          "PLACEHOLDER": "Select category",
+          "NO_RESULT": "No category found",
+          "SEARCH_PLACEHOLDER": "Search category"
+        },
+        "AUTHOR": {
+          "LABEL": "Author",
+          "TITLE": "Select author",
+          "PLACEHOLDER": "Select author",
+          "NO_RESULT": "No authors found",
+          "SEARCH_PLACEHOLDER": "Search author"
+        },
+        "META_TITLE": {
+          "LABEL": "Meta title",
+          "PLACEHOLDER": "Add a meta title"
+        },
+        "META_DESCRIPTION": {
+          "LABEL": "Meta description",
+          "PLACEHOLDER": "Add your meta description for better SEO results..."
+        },
+        "META_TAGS": {
+          "LABEL": "Meta tags",
+          "PLACEHOLDER": "Add meta tags separated by comma..."
+        }
+      },
+      "BUTTONS": {
+        "ARCHIVE": "Archive article",
+        "DELETE": "Delete article"
+      }
+    },
+    "PORTAL": {
+      "HEADER": "Portals",
+      "DEFAULT": "Default",
+      "NEW_BUTTON": "New Portal",
+      "ACTIVE_BADGE": "active",
+      "CHOOSE_LOCALE_LABEL": "Choose a locale",
+      "LOADING_MESSAGE": "Loading portals...",
+      "ARTICLES_LABEL": "articles",
+      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "ADD_NEW_LOCALE": "Add a new locale",
+      "POPOVER": {
+        "TITLE": "Portals",
+        "PORTAL_SETTINGS": "Portal settings",
+        "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
+        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CHOOSE_LOCALE_BUTTON": "Choose Locale"
+      },
+      "PORTAL_SETTINGS": {
+        "LIST_ITEM": {
+          "HEADER": {
+            "COUNT_LABEL": "articles",
+            "ADD": "Add locale",
+            "VISIT": "Visit site",
+            "SETTINGS": "Settings",
+            "DELETE": "Delete"
+          },
+          "PORTAL_CONFIG": {
+            "TITLE": "Portal Configurations",
+            "ITEMS": {
+              "NAME": "Name",
+              "DOMAIN": "Custom domain",
+              "SLUG": "Slug",
+              "TITLE": "Portal title",
+              "THEME": "Theme color",
+              "SUB_TEXT": "Portal sub text"
+            }
+          },
+          "AVAILABLE_LOCALES": {
+            "TITLE": "Available locales",
+            "TABLE": {
+              "NAME": "Locale name",
+              "CODE": "Locale code",
+              "ARTICLE_COUNT": "No. of articles",
+              "CATEGORIES": "No. of categories",
+              "SWAP": "Swap",
+              "DELETE": "Delete",
+              "DEFAULT_LOCALE": "Default"
+            }
+          }
+        },
+        "DELETE_PORTAL": {
+          "TITLE": "Delete portal",
+          "MESSAGE": "Are you sure you want to delete this portal",
+          "YES": "Yes, delete portal",
+          "NO": "No, keep portal",
+          "API": {
+            "DELETE_SUCCESS": "Portal deleted successfully",
+            "DELETE_ERROR": "Error while deleting portal"
+          }
+        }
+      },
+      "EDIT": {
+        "HEADER_TEXT": "Edit portal",
+        "TABS": {
+          "BASIC_SETTINGS": {
+            "TITLE": "Basic information"
+          },
+          "CUSTOMIZATION_SETTINGS": {
+            "TITLE": "Portal customization"
+          },
+          "CATEGORY_SETTINGS": {
+            "TITLE": "Categories"
+          },
+          "LOCALE_SETTINGS": {
+            "TITLE": "Locales"
+          }
+        },
+        "CATEGORIES": {
+          "TITLE": "Categories in",
+          "NEW_CATEGORY": "New category",
+          "TABLE": {
+            "NAME": "Name",
+            "DESCRIPTION": "Description",
+            "LOCALE": "Locale",
+            "ARTICLE_COUNT": "No. of articles",
+            "ACTION_BUTTON": {
+              "EDIT": "Edit category",
+              "DELETE": "Delete category"
+            },
+            "EMPTY_TEXT": "No categories found"
+          }
+        },
+        "EDIT_BASIC_INFO": {
+          "BUTTON_TEXT": "Update basic settings"
+        }
+      },
+      "ADD": {
+        "CREATE_FLOW": [
+          {
+            "title": "Help center information",
+            "route": "new_portal_information",
+            "body": "Basic information about portal",
+            "CREATE_BASIC_SETTING_BUTTON": "Create portal basic settings"
+          },
+          {
+            "title": "Help center customization",
+            "route": "portal_customization",
+            "body": "Customize portal",
+            "UPDATE_PORTAL_BUTTON": "Update portal settings"
+          },
+          {
+            "title": "Voila! 🎉",
+            "route": "portal_finish",
+            "body": "You're all set!",
+            "FINISH": "Finish"
+          }
+        ],
+        "CREATE_FLOW_PAGE": {
+          "BACK_BUTTON": "Back",
+          "BASIC_SETTINGS_PAGE": {
+            "HEADER": "Create Portal",
+            "TITLE": "Help center information",
+            "CREATE_BASIC_SETTING_BUTTON": "Create portal basic settings"
+          },
+          "CUSTOMIZATION_PAGE": {
+            "HEADER": "Portal customisation",
+            "TITLE": "Help center customization",
+            "UPDATE_PORTAL_BUTTON": "Update portal settings"
+          },
+          "FINISH_PAGE": {
+            "TITLE": "Voila!🎉 You're all set up!",
+            "MESSAGE": "You can now see this created portal on your all portals page.",
+            "FINISH": "Go to all portals page"
+          }
+        },
+        "LOGO": {
+          "LABEL": "Logo",
+          "UPLOAD_BUTTON": "Upload logo",
+          "HELP_TEXT": "This logo will be displayed on the portal header."
+        },
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Portal name",
+          "HELP_TEXT": "The name will be used in the public facing portal internally.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Portal slug for urls",
+          "ERROR": "Slug is required"
+        },
+        "DOMAIN": {
+          "LABEL": "Custom Domain",
+          "PLACEHOLDER": "Portal custom domain",
+          "HELP_TEXT": "Add only If you want to use a custom domain for your portals. Eg: https://example.com",
+          "ERROR": "Enter a valid domain URL"
+        },
+        "HOME_PAGE_LINK": {
+          "LABEL": "Home Page Link",
+          "PLACEHOLDER": "Portal home page link",
+          "HELP_TEXT": "The link used to return from the portal to the home page. Eg: https://example.com",
+          "ERROR": "Enter a valid home page URL"
+        },
+        "THEME_COLOR": {
+          "LABEL": "Portal theme color",
+          "HELP_TEXT": "This color will show as the theme color for the portal."
+        },
+        "PAGE_TITLE": {
+          "LABEL": "Page Title",
+          "PLACEHOLDER": "Portal page title",
+          "HELP_TEXT": "The page title will be used in the public facing portal.",
+          "ERROR": "Page title is required"
+        },
+        "HEADER_TEXT": {
+          "LABEL": "Header Text",
+          "PLACEHOLDER": "Portal header text",
+          "HELP_TEXT": "The Portal header text will be used in the public facing portal.",
+          "ERROR": "Portal header text is required"
+        },
+        "API": {
+          "SUCCESS_MESSAGE_FOR_BASIC": "Portal created successfully.",
+          "ERROR_MESSAGE_FOR_BASIC": "Couldn't create the portal. Try again.",
+          "SUCCESS_MESSAGE_FOR_UPDATE": "Portal updated successfully.",
+          "ERROR_MESSAGE_FOR_UPDATE": "Couldn't update the portal. Try again."
+        }
+      },
+      "ADD_LOCALE": {
+        "TITLE": "Add a new locale",
+        "SUB_TITLE": "This adds a new locale to your available translation list.",
+        "PORTAL": "Portal",
+        "LOCALE": {
+          "LABEL": "Locale",
+          "PLACEHOLDER": "Choose a locale",
+          "ERROR": "Locale is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create locale",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Locale added successfully",
+          "ERROR_MESSAGE": "Unable to add locale. Try again."
+        }
+      },
+      "CHANGE_DEFAULT_LOCALE": {
+        "API": {
+          "SUCCESS_MESSAGE": "Default locale updated successfully",
+          "ERROR_MESSAGE": "Unable to update default locale. Try again."
+        }
+      },
+      "DELETE_LOCALE": {
+        "API": {
+          "SUCCESS_MESSAGE": "Locale removed from portal successfully",
+          "ERROR_MESSAGE": "Unable to remove locale from portal. Try again."
+        }
+      }
+    },
+    "TABLE": {
+      "LOADING_MESSAGE": "Loading articles...",
+      "404": "No articles matches your search 🔍",
+      "NO_ARTICLES": "There are no available articles",
+      "HEADERS": {
+        "TITLE": "Title",
+        "CATEGORY": "Category",
+        "READ_COUNT": "Read count",
+        "STATUS": "Status",
+        "LAST_EDITED": "Last edited"
+      },
+      "COLUMNS": {
+        "BY": "by"
+      }
+    },
+    "EDIT_ARTICLE": {
+      "LOADING": "Loading article...",
+      "TITLE_PLACEHOLDER": "Article title goes here",
+      "CONTENT_PLACEHOLDER": "Write your article here",
+      "API": {
+        "ERROR": "Error while saving article"
+      }
+    },
+    "PUBLISH_ARTICLE": {
+      "API": {
+        "ERROR": "Error while publishing article",
+        "SUCCESS": "Article published successfully"
+      }
+    },
+    "ARCHIVE_ARTICLE": {
+      "API": {
+        "ERROR": "Error while archiving article",
+        "SUCCESS": "Article archived successfully"
+      }
+    },
+    "DELETE_ARTICLE": {
+      "MODAL": {
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete the article?",
+          "YES": "Yes, Delete",
+          "NO": "No, Keep it"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Article deleted successfully",
+        "ERROR_MESSAGE": "Error while deleting article"
+      }
+    },
+    "CREATE_ARTICLE": {
+      "ERROR_MESSAGE": "Please add the article heading and content then only you can update the settings"
+    },
+    "SIDEBAR": {
+      "SEARCH": {
+        "PLACEHOLDER": "Search for articles"
+      }
+    },
+    "CATEGORY": {
+      "ADD": {
+        "TITLE": "Create a category",
+        "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/hc/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Create category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category created successfully",
+          "ERROR_MESSAGE": "Unable to create category"
+        }
+      },
+      "EDIT": {
+        "TITLE": "Edit a category",
+        "SUB_TITLE": "Editing a category will update the category in the public facing portal.",
+        "PORTAL": "Portal",
+        "LOCALE": "Locale",
+        "NAME": {
+          "LABEL": "Name",
+          "PLACEHOLDER": "Category name",
+          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "ERROR": "Name is required"
+        },
+        "SLUG": {
+          "LABEL": "Slug",
+          "PLACEHOLDER": "Category slug for urls",
+          "HELP_TEXT": "app.chatwoot.com/hc/my-portal/en-US/categories/my-slug",
+          "ERROR": "Slug is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Give a short description about the category.",
+          "ERROR": "Description is required"
+        },
+        "BUTTONS": {
+          "CREATE": "Update category",
+          "CANCEL": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Category updated successfully",
+          "ERROR_MESSAGE": "Unable to update category"
+        }
+      },
+      "DELETE": {
+        "API": {
+          "SUCCESS_MESSAGE": "Category deleted successfully",
+          "ERROR_MESSAGE": "Unable to delete category"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
new file mode 100644
index 000000000..87ec7a845
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
@@ -0,0 +1,695 @@
+{
+  "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)",
+        "ERROR": "Please enter a valid inbox name"
+      },
+      "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": "Automatically send a greeting message when a new conversation is created.",
+          "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",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to create a website channel, please try again"
+        }
+      },
+      "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"
+        },
+        "MESSAGING_SERVICE_SID": {
+          "LABEL": "Messaging Service SID",
+          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "ERROR": "This field is required",
+          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+        },
+        "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 provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+        },
+        "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 provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          },
+          "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",
+          "WHATSAPP_CLOUD": "WhatsApp Cloud",
+          "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 provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+        },
+        "PHONE_NUMBER_ID": {
+          "LABEL": "Phone number ID",
+          "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
+          "ERROR": "Please enter a valid value."
+        },
+        "BUSINESS_ACCOUNT_ID": {
+          "LABEL": "Business Account ID",
+          "PLACEHOLDER": "Please enter the Business Account ID obtained from Facebook developer dashboard.",
+          "ERROR": "Please enter a valid value."
+        },
+        "WEBHOOK_VERIFY_TOKEN": {
+          "LABEL": "Webhook Verify Token",
+          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "ERROR": "Please enter a valid value."
+        },
+        "API_KEY": {
+          "LABEL": "API key",
+          "SUBTITLE": "Configure the WhatsApp API key.",
+          "PLACEHOLDER": "API key",
+          "ERROR": "Please enter a valid value."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "WEBHOOK_URL": "Webhook URL",
+          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
+        },
+        "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": "Provide the email address where your customers send support requests.",
+          "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 widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+      },
+      "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 :)"
+      },
+      "EMAIL_PROVIDER": {
+        "TITLE": "Select your email provider",
+        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+      },
+      "MICROSOFT": {
+        "TITLE": "Microsoft Email",
+        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
+        "EMAIL_PLACEHOLDER": "Enter email address",
+        "HELP": "To add your Microsoft account as a channel, you need to authenticate your Microsoft account by clicking on 'Sign in with Microsoft' ",
+        "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
+      }
+    },
+    "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": "We couldn't update inbox settings. Please try again later."
+      },
+      "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"
+      },
+      "LOCK_TO_SINGLE_CONVERSATION": {
+        "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",
+      "WIDGET_BUILDER": "Widget Builder",
+      "BOT_CONFIGURATION": "Bot Configuration"
+    },
+    "SETTINGS": "Settings",
+    "FEATURES": {
+      "LABEL": "Features",
+      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
+      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from 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",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "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.",
+      "LOCK_TO_SINGLE_CONVERSATION": "Lock to single conversation",
+      "LOCK_TO_SINGLE_CONVERSATION_SUB_TEXT": "Enable or disable multiple conversations for the same contact in this inbox",
+      "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": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "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.",
+      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_TITLE": "API Key",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
+      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
+    },
+    "AUTO_ASSIGNMENT": {
+      "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
+      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
+      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limit the maximum number of conversations from this inbox that can be auto assigned to an agent"
+    },
+    "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.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Key",
+        "TYPE": "Type",
+        "REQUIRED": "Required"
+      },
+      "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"
+      },
+      "ALL_DAY": "All-Day"
+    },
+    "IMAP": {
+      "TITLE": "IMAP",
+      "SUBTITLE": "Set your IMAP details",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
+      "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"
+      },
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
+      },
+      "ENABLE_SSL": "Enable SSL"
+    },
+    "MICROSOFT": {
+      "TITLE": "Microsoft",
+      "SUBTITLE": "Reauthorize your MICROSOFT account"
+    },
+    "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"
+      },
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "PLACE_HOLDER": "Password"
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACE_HOLDER": "Domain"
+      },
+      "ENCRYPTION": "Encryption",
+      "SSL_TLS": "SSL/TLS",
+      "START_TLS": "STARTTLS",
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: ",
+    "WIDGET_BUILDER": {
+      "WIDGET_OPTIONS": {
+        "AVATAR": {
+          "LABEL": "Website Avatar",
+          "DELETE": {
+            "API": {
+              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "ERROR_MESSAGE": "There was an error, please try again"
+            }
+          }
+        },
+        "WEBSITE_NAME": {
+          "LABEL": "Website Name",
+          "PLACE_HOLDER": "Enter your website name (eg: Acme Inc)",
+          "ERROR": "Please enter a valid website name"
+        },
+        "WELCOME_HEADING": {
+          "LABEL": "Welcome Heading",
+          "PLACE_HOLDER": "Hi there!"
+        },
+        "WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACE_HOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "REPLY_TIME": {
+          "LABEL": "Reply Time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day"
+        },
+        "WIDGET_COLOR_LABEL": "Widget Color",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_LAUNCHER_TITLE": {
+          "DEFAULT": "Chat with us",
+          "LABEL": "Widget Bubble Launcher Title",
+          "PLACE_HOLDER": "Chat with us"
+        },
+        "UPDATE": {
+          "BUTTON_TEXT": "Update Widget Settings",
+          "API": {
+            "SUCCESS_MESSAGE": "Widget settings updated successfully",
+            "ERROR_MESSAGE": "Unable to update widget settings"
+          }
+        },
+        "WIDGET_VIEW_OPTION": {
+          "PREVIEW": "Preview",
+          "SCRIPT": "Script"
+        },
+        "WIDGET_BUBBLE_POSITION": {
+          "LEFT": "Left",
+          "RIGHT": "Right"
+        },
+        "WIDGET_BUBBLE_TYPE": {
+          "STANDARD": "Standard",
+          "EXPANDED_BUBBLE": "Expanded Bubble"
+        }
+      },
+      "WIDGET_SCREEN": {
+        "DEFAULT": "Default",
+        "CHAT": "Chat"
+      },
+      "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"
+      },
+      "FOOTER": {
+        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "CHAT_INPUT_PLACEHOLDER": "Type your message"
+      },
+      "BODY": {
+        "TEAM_AVAILABILITY": {
+          "ONLINE": "We are Online",
+          "OFFLINE": "We are away at the moment"
+        },
+        "USER_MESSAGE": "Hi",
+        "AGENT_MESSAGE": "Hello"
+      },
+      "BRANDING_TEXT": "Powered by Chatwoot",
+      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+    },
+    "EMAIL_PROVIDERS": {
+      "MICROSOFT": "Microsoft",
+      "OTHER_PROVIDERS": "Other Providers"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrationApps.json b/app/javascript/dashboard/i18n/locale/hy/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
new file mode 100644
index 000000000..00d92f297
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -0,0 +1,144 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "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.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "Events",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Conversation Created",
+            "CONVERSATION_STATUS_CHANGED": "Conversation Status Changed",
+            "CONVERSATION_UPDATED": "Conversation Updated",
+            "MESSAGE_CREATED": "Message created",
+            "MESSAGE_UPDATED": "Message updated",
+            "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
+            "CONTACT_CREATED": "Contact created",
+            "CONTACT_UPDATED": "Contact updated"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Example: https://example/api/webhook",
+          "ERROR": "Please enter a valid URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Create 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",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook configuration 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 the webhook? (%{webhookURL})",
+          "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>"
+      }
+    },
+    "DYTE": {
+      "CLICK_HERE_TO_JOIN": "Click here to join",
+      "LEAVE_THE_ROOM": "Leave the room",
+      "START_VIDEO_CALL_HELP_TEXT": "Start a new video call with the customer",
+      "JOIN_ERROR": "There was an error joining the call, please try again",
+      "CREATE_ERROR": "There was an error creating a meeting link, please try again"
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    },
+    "DASHBOARD_APPS": {
+      "TITLE": "Dashboard Apps",
+      "HEADER_BTN_TXT": "Add a new dashboard app",
+      "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
+      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
+      "LIST": {
+        "404": "There are no dashboard apps configured on this account yet",
+        "LOADING": "Fetching dashboard apps...",
+        "TABLE_HEADER": [
+          "Name",
+          "Endpoint"
+        ],
+        "EDIT_TOOLTIP": "Edit app",
+        "DELETE_TOOLTIP": "Delete app"
+      },
+      "FORM": {
+        "TITLE_LABEL": "Name",
+        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
+        "TITLE_ERROR": "A name for the dashboard app is required",
+        "URL_LABEL": "Endpoint",
+        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
+        "URL_ERROR": "A valid URL is required"
+      },
+      "CREATE": {
+        "HEADER": "Add a new dashboard app",
+        "FORM_SUBMIT": "Submit",
+        "FORM_CANCEL": "Cancel",
+        "API_SUCCESS": "Dashboard app configured successfully",
+        "API_ERROR": "We couldn't create an app. Please try again later"
+      },
+      "UPDATE": {
+        "HEADER": "Edit dashboard app",
+        "FORM_SUBMIT": "Update",
+        "FORM_CANCEL": "Cancel",
+        "API_SUCCESS": "Dashboard app updated successfully",
+        "API_ERROR": "We couldn't update the app. Please try again later"
+      },
+      "DELETE": {
+        "CONFIRM_YES": "Yes, delete it",
+        "CONFIRM_NO": "No, keep it",
+        "TITLE": "Confirm deletion",
+        "MESSAGE": "Are you sure to delete the app - %{appName}?",
+        "API_SUCCESS": "Dashboard app deleted successfully",
+        "API_ERROR": "We couldn't delete the app. Please try again later"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/hy/labelsMgmt.json
new file mode 100644
index 000000000..db12fa32a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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/hy/login.json b/app/javascript/dashboard/i18n/locale/hy/login.json
new file mode 100644
index 000000000..25c956a81
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/login.json
@@ -0,0 +1,26 @@
+{
+  "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"
+    },
+    "OAUTH": {
+      "GOOGLE_LOGIN": "Login with Google",
+      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
+      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+    },
+    "FORGOT_PASSWORD": "Forgot your password?",
+    "CREATE_NEW_ACCOUNT": "Create new account",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/macros.json b/app/javascript/dashboard/i18n/locale/hy/macros.json
new file mode 100644
index 000000000..3a59d4f26
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/macros.json
@@ -0,0 +1,78 @@
+{
+  "MACROS": {
+    "HEADER": "Macros",
+    "HEADER_BTN_TXT": "Add a new macro",
+    "HEADER_BTN_TXT_SAVE": "Save macro",
+    "LOADING": "Fetching macros",
+    "SIDEBAR_TXT": "<p><b>Macros</b><p>A macro is a set of saved actions that help customer service agents easily complete tasks. The agents can define a set of actions like tagging a conversation with a label, sending an email transcript, updating a custom attribute, etc., and they can run these actions in a single click. When the agents run the macro, the actions would be performed sequentially in the order they are defined. Macros improve productivity and increase consistency in actions. </p><p>A macro can be helpful in 2 ways. </p><p><b>As an agent assist:</b> If an agent performs a set of actions multiple times, they can save it as a macro and execute all the actions together using a single click.</p><p><b>As an option to onboard a team member:</b> Every agent has to perform many different checks/actions during each conversation. Onboarding a new support team member will be easy if pre-defined macros are available on the account. Instead of describing each step in detail, the manager/team lead can point to the macros used in different scenarios.</p>",
+    "ERROR": "Something went wrong. Please try again",
+    "ORDER_INFO": "Macros will run in the order you add your actions. You can rearrange them by dragging them by the handle beside each node.",
+    "ADD": {
+      "FORM": {
+        "NAME": {
+          "LABEL": "Macro name",
+          "PLACEHOLDER": "Enter a name for your macro",
+          "ERROR": "Name is required for creating a macro"
+        },
+        "ACTIONS": {
+          "LABEL": "Actions"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Macro added successfully",
+        "ERROR_MESSAGE": "Unable to create macro, Please try again later"
+      }
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Created by",
+        "Last updated by",
+        "Visibility"
+      ],
+      "404": "No macros found"
+    },
+    "DELETE": {
+      "TOOLTIP": "Delete macro",
+      "CONFIRM": {
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete",
+        "NO": "No"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Macro deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the macro. Please try again later"
+      }
+    },
+    "EDIT": {
+      "TOOLTIP": "Edit macro",
+      "API": {
+        "SUCCESS_MESSAGE": "Macro updated successfully",
+        "ERROR_MESSAGE": "Could not update Macro, Please try again later"
+      }
+    },
+    "EDITOR": {
+      "START_FLOW": "Start Flow",
+      "END_FLOW": "End Flow",
+      "LOADING": "Fetching macro",
+      "ADD_BTN_TOOLTIP": "Add new action",
+      "DELETE_BTN_TOOLTIP": "Delete Action",
+      "VISIBILITY": {
+        "LABEL": "Macro Visibility",
+        "GLOBAL": {
+          "LABEL": "Public",
+          "DESCRIPTION": "This macro is available publicly for all agents in this account."
+        },
+        "PERSONAL": {
+          "LABEL": "Private",
+          "DESCRIPTION": "This macro will be private to you and not be available to others."
+        }
+      }
+    },
+    "EXECUTE": {
+      "BUTTON_TOOLTIP": "Execute",
+      "PREVIEW": "Preview Macro",
+      "EXECUTED_SUCCESSFULLY": "Macro executed successfully"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/report.json b/app/javascript/dashboard/i18n/locale/hy/report.json
new file mode 100644
index 000000000..48dcccc2b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/report.json
@@ -0,0 +1,462 @@
+{
+  "REPORT": {
+    "HEADER": "Conversations",
+    "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 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "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"
+    },
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
+    "DURATION_FILTER_LABEL": "Duration",
+    "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"
+      }
+    ],
+    "BUSINESS_HOURS": "Business Hours"
+  },
+  "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 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "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 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "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 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "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 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "RESOLUTION_TIME": {
+        "NAME": "Resolution Time",
+        "DESC": "( Avg )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+      },
+      "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.",
+    "DOWNLOAD": "Download CSAT Reports",
+    "FILTERS": {
+      "AGENTS": {
+        "PLACEHOLDER": "Choose Agents"
+      }
+    },
+    "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"
+      }
+    }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Overview",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Open",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Unassigned"
+    },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Agent",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Status"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Busy",
+      "OFFLINE": "Offline"
+    }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/resetPassword.json b/app/javascript/dashboard/i18n/locale/hy/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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/hy/search.json b/app/javascript/dashboard/i18n/locale/hy/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
new file mode 100644
index 000000000..ec2d94744
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
@@ -0,0 +1,23 @@
+{
+  "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"
+    },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/settings.json b/app/javascript/dashboard/i18n/locale/hy/settings.json
new file mode 100644
index 000000000..0a9e1220c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/settings.json
@@ -0,0 +1,314 @@
+{
+  "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."
+      },
+      "SEND_MESSAGE": {
+        "TITLE": "Hotkey to send messages",
+        "NOTE": "You can select a hotkey (either Enter or Cmd/Ctrl+Enter) based on your preference of writing.",
+        "UPDATE_SUCCESS": "Your settings have been updated successfully",
+        "CARD": {
+          "ENTER_KEY": {
+            "HEADING": "Enter (↵)",
+            "CONTENT": "Send messages by pressing Enter key instead of clicking the send button."
+          },
+          "CMD_ENTER_KEY": {
+            "HEADING": "Cmd/Ctrl + Enter (⌘ + ↵)",
+            "CONTENT": "Send messages by pressing Cmd/Ctrl + enter key instead of clicking the send button."
+          }
+        }
+      },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from your email inbox. 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.",
+        "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.",
+        "ALERT_TYPE": {
+          "TITLE": "Alert events:",
+          "NONE": "None",
+          "ASSIGNED": "Assigned Conversations",
+          "ALL_CONVERSATIONS": "All Conversations"
+        },
+        "DEFAULT_TONE": {
+          "TITLE": "Alert tone:"
+        },
+        "CONDITIONS": {
+          "TITLE": "Alert conditions:",
+          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
+          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+        }
+      },
+      "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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating 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",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating 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"
+        ],
+        "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
+        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
+      },
+      "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",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now",
+    "DELETED_USER": "Deleted User",
+    "ACCOUNT_SUSPENDED": {
+      "TITLE": "Account Suspended",
+      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+    }
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Copied to clipboard"
+    },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading...",
+      "INSTAGRAM_STORY_UNAVAILABLE": "This story is no longer available."
+    },
+    "LOCATION_BUBBLE": {
+      "SEE_ON_MAP": "See on map"
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
+    "CONVERSATIONS": "Conversations",
+    "ALL_CONVERSATIONS": "All Conversations",
+    "MENTIONED_CONVERSATIONS": "Mentions",
+    "PARTICIPATING_CONVERSATIONS": "Participating",
+    "UNATTENDED_CONVERSATIONS": "Unattended",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "CONTACTS": "Contacts",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "AGENT_BOTS": "Bots",
+    "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",
+    "MACROS": "Macros",
+    "TEAMS": "Teams",
+    "BILLING": "Billing",
+    "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_CONVERSATION": "Conversations",
+    "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",
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+    "HELP_CENTER": {
+      "TITLE": "Help Center (Beta)",
+      "ALL_ARTICLES": "All Articles",
+      "MY_ARTICLES": "My Articles",
+      "DRAFT": "Draft",
+      "ARCHIVED": "Archived",
+      "CATEGORY": "Category",
+      "SETTINGS": "Settings",
+      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+    },
+    "SET_AUTO_OFFLINE": {
+      "TEXT": "Mark offline automatically",
+      "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard."
+    },
+    "DOCS": "Read docs"
+  },
+  "BILLING_SETTINGS": {
+    "TITLE": "Billing",
+    "CURRENT_PLAN": {
+      "TITLE": "Current Plan",
+      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+    },
+    "MANAGE_SUBSCRIPTION": {
+      "TITLE": "Manage your subscription",
+      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
+      "BUTTON_TXT": "Go to the billing portal"
+    },
+    "CHAT_WITH_US": {
+      "TITLE": "Need help?",
+      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "BUTTON_TXT": "Chat with us"
+    },
+    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
+  },
+  "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": "Company Name",
+        "PLACEHOLDER": "Wayne Enterprises"
+      },
+      "SUBMIT": "Submit"
+    }
+  },
+  "KEYBOARD_SHORTCUTS": {
+    "TOGGLE_MODAL": "View all 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",
+      "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/hy/signup.json b/app/javascript/dashboard/i18n/locale/hy/signup.json
new file mode 100644
index 000000000..10ddc5b86
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/signup.json
@@ -0,0 +1,44 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "Create an account",
+    "TITLE": "Register",
+    "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
+    "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
+    "TERMS_ACCEPT": "By creating an account, 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>",
+    "OAUTH": {
+      "GOOGLE_SIGNUP": "Sign up with Google"
+    },
+    "COMPANY_NAME": {
+      "LABEL": "Company name",
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company 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": "Please enter a valid work email address"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+    },
+    "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": "Create account",
+    "HAVE_AN_ACCOUNT": "Already have an account?"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hy/teamsSettings.json
new file mode 100644
index 000000000..f9ecaaaae
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/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 at least 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/hy/webhooks.json b/app/javascript/dashboard/i18n/locale/hy/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/hy/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/whatsappTemplates.json
@@ -0,0 +1,25 @@
+{
+    "WHATSAPP_TEMPLATES": {
+        "MODAL": {
+            "TITLE": "Whatsapp Templates",
+            "SUBTITLE": "Select the whatsapp template you want to send",
+            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+        },
+        "PICKER": {
+            "SEARCH_PLACEHOLDER": "Search Templates",
+            "NO_TEMPLATES_FOUND": "No templates found for",
+            "LABELS": {
+                "LANGUAGE": "Language",
+                "TEMPLATE_BODY": "Template Body",
+                "CATEGORY": "Category"
+            }
+        },
+        "PARSER": {
+            "VARIABLES_LABEL": "Variables",
+            "VARIABLE_PLACEHOLDER": "Enter %{variable} value",
+            "GO_BACK_LABEL": "Go Back",
+            "SEND_MESSAGE_LABEL": "Send Message",
+            "FORM_ERROR_MESSAGE": "Please fill all variables before sending"
+        }
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/report.json b/app/javascript/dashboard/i18n/locale/id/report.json
index ef61be51f..fcb3b4717 100644
--- a/app/javascript/dashboard/i18n/locale/id/report.json
+++ b/app/javascript/dashboard/i18n/locale/id/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Belum ditugaskan"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Sibuk",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/search.json b/app/javascript/dashboard/i18n/locale/id/search.json
new file mode 100644
index 000000000..84b59bcef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Semua",
+      "CONTACTS": "Kontak",
+      "CONVERSATIONS": "Percakapan",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontak",
+      "CONVERSATIONS": "Percakapan",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/is/report.json b/app/javascript/dashboard/i18n/locale/is/report.json
index 05ccc162e..a4c60ffcf 100644
--- a/app/javascript/dashboard/i18n/locale/is/report.json
+++ b/app/javascript/dashboard/i18n/locale/is/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/search.json b/app/javascript/dashboard/i18n/locale/is/search.json
new file mode 100644
index 000000000..3d4a8b532
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/is/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Allt",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Samtöl",
+      "MESSAGES": "Skilaboð"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Samtöl",
+      "MESSAGES": "Skilaboð"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/chatlist.json b/app/javascript/dashboard/i18n/locale/it/chatlist.json
index 5f3564945..b2fbe355b 100644
--- a/app/javascript/dashboard/i18n/locale/it/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/it/chatlist.json
@@ -15,7 +15,7 @@
     "FILTER_ALL": "Tutti",
     "ASSIGNEE_TYPE_TABS": {
       "me": "Mie",
-      "unassigned": "Non assegnato",
+      "unassigned": "Non assegnate",
       "all": "Tutti"
     },
     "CHAT_STATUS_FILTER_ITEMS": {
diff --git a/app/javascript/dashboard/i18n/locale/it/report.json b/app/javascript/dashboard/i18n/locale/it/report.json
index 15d1eaee2..dd3d26e5e 100644
--- a/app/javascript/dashboard/i18n/locale/it/report.json
+++ b/app/javascript/dashboard/i18n/locale/it/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Non partecipate",
       "UNASSIGNED": "Non assegnato"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversazioni degli agenti",
       "LOADING_MESSAGE": "Caricamento metriche agenti...",
@@ -443,5 +449,14 @@
       "BUSY": "Occupato",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/search.json b/app/javascript/dashboard/i18n/locale/it/search.json
new file mode 100644
index 000000000..634463e6b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Tutti",
+      "CONTACTS": "Contatti",
+      "CONVERSATIONS": "Conversazioni",
+      "MESSAGES": "Messaggi"
+    },
+    "SECTION": {
+      "CONTACTS": "Contatti",
+      "CONVERSATIONS": "Conversazioni",
+      "MESSAGES": "Messaggi"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
index 67bc172a4..9f695a4c8 100644
--- a/app/javascript/dashboard/i18n/locale/ja/report.json
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "未割当"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "取り込み中",
       "OFFLINE": "オフライン"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/search.json b/app/javascript/dashboard/i18n/locale/ja/search.json
new file mode 100644
index 000000000..b3f9b9cd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "すべて",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "会話データ",
+      "MESSAGES": "メッセージ"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "会話データ",
+      "MESSAGES": "メッセージ"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/report.json b/app/javascript/dashboard/i18n/locale/ka/report.json
index 0bd9b544d..48dcccc2b 100644
--- a/app/javascript/dashboard/i18n/locale/ka/report.json
+++ b/app/javascript/dashboard/i18n/locale/ka/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/search.json b/app/javascript/dashboard/i18n/locale/ka/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/report.json b/app/javascript/dashboard/i18n/locale/ko/report.json
index 49abca501..b406c1af1 100644
--- a/app/javascript/dashboard/i18n/locale/ko/report.json
+++ b/app/javascript/dashboard/i18n/locale/ko/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "지정되지 않음"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "바쁨",
       "OFFLINE": "오프라인"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/search.json b/app/javascript/dashboard/i18n/locale/ko/search.json
new file mode 100644
index 000000000..e8eb30370
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "모두",
+      "CONTACTS": "연락처",
+      "CONVERSATIONS": "대화",
+      "MESSAGES": "메시지"
+    },
+    "SECTION": {
+      "CONTACTS": "연락처",
+      "CONVERSATIONS": "대화",
+      "MESSAGES": "메시지"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "봇",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lt/report.json b/app/javascript/dashboard/i18n/locale/lt/report.json
index 0bd9b544d..48dcccc2b 100644
--- a/app/javascript/dashboard/i18n/locale/lt/report.json
+++ b/app/javascript/dashboard/i18n/locale/lt/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/search.json b/app/javascript/dashboard/i18n/locale/lt/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lt/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
index f3490c4eb..8735b53c1 100644
--- a/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
@@ -43,7 +43,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Pielāgotā īpašība ir veiksmīgi pievienota!",
-        "ERROR_MESSAGE": "Could not create a Custom Attribute. Please try again later."
+        "ERROR_MESSAGE": "Nevarēja izveidot Pielāgotu Atribūtu. Lūdzu, vēlāk pamēģiniet vēlreiz."
       }
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/report.json b/app/javascript/dashboard/i18n/locale/lv/report.json
index dbb103138..27cb5f89e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/report.json
+++ b/app/javascript/dashboard/i18n/locale/lv/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Bez uzraudzības",
       "UNASSIGNED": "Nav piešķirtas"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Sarunu Satiksme",
+      "NO_CONVERSATIONS": "Nav sarunu",
+      "CONVERSATION": "%{count} saruna",
+      "CONVERSATIONS": "%{count} sarunas"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Aģentu sarunas",
       "LOADING_MESSAGE": "Notiek aģentu metrikas ielāde...",
@@ -443,5 +449,14 @@
       "BUSY": "Aizņemts",
       "OFFLINE": "Bezsaistē"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Svētdiena",
+    "MONDAY": "Pirmdiena",
+    "TUESDAY": "Otrdiena",
+    "WEDNESDAY": "Trešdiena",
+    "THURSDAY": "Ceturtdiena",
+    "FRIDAY": "Piektdiena",
+    "SATURDAY": "Sestdiena"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/search.json b/app/javascript/dashboard/i18n/locale/lv/search.json
new file mode 100644
index 000000000..0373eb213
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Visi",
+      "CONTACTS": "Kontaktpersonas",
+      "CONVERSATIONS": "Sarunas",
+      "MESSAGES": "Ziņojumi"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontaktpersonas",
+      "CONVERSATIONS": "Sarunas",
+      "MESSAGES": "Ziņojumi"
+    },
+    "EMPTY_STATE": "Vaicājumam '%{query}' nav atrasts neviens %{item} vienums",
+    "EMPTY_STATE_FULL": "Vaicājumam '%{query}' nav atrasts neviens rezultāts",
+    "PLACEHOLDER_KEYBINDING": "/ fokusēt",
+    "INPUT_PLACEHOLDER": "Meklēt ziņas saturu, kontaktpersonas vārdu, e-pastu vai tālruni vai sarunas",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Lasīt vairāk",
+    "WROTE": "rakstīja:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/signup.json b/app/javascript/dashboard/i18n/locale/lv/signup.json
index cbd8a9709..0f8bebdc2 100644
--- a/app/javascript/dashboard/i18n/locale/lv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lv/signup.json
@@ -1,10 +1,10 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Create an account",
+    "TRY_WOOT": "Izveidot kontu",
     "TITLE": "Reģistrēt",
     "TESTIMONIAL_HEADER": "Viss, kas nepieciešams, ir viens solis, lai virzītos uz priekšu",
     "TESTIMONIAL_CONTENT": "Jūs esat viena soļa attālumā no klientu piesaistīšanas, noturēšanas un jaunu klientu atrašanas.",
-    "TERMS_ACCEPT": "By creating an account, 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>",
+    "TERMS_ACCEPT": "Izveidojot kontu, Jūs piekrītat mūsu <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privātuma politikai</a>",
     "OAUTH": {
       "GOOGLE_SIGNUP": "Reģistrēties, izmantojot Google"
     },
@@ -38,7 +38,7 @@
       "SUCCESS_MESSAGE": "Reģistrācija sekmīga",
       "ERROR_MESSAGE": "Nevar izveidot savienojumu ar Woot serveri. Lūdzu, vēlāk pamēģiniet vēlreiz"
     },
-    "SUBMIT": "Create account",
+    "SUBMIT": "Izveidot kontu",
     "HAVE_AN_ACCOUNT": "Jau ir konts?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/report.json b/app/javascript/dashboard/i18n/locale/ml/report.json
index fa23e9634..7f6386ec0 100644
--- a/app/javascript/dashboard/i18n/locale/ml/report.json
+++ b/app/javascript/dashboard/i18n/locale/ml/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "നിയുക്തമാക്കാത്തത്"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "തിരക്ക്",
       "OFFLINE": "ഓഫ്‌ലൈൻ"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/search.json b/app/javascript/dashboard/i18n/locale/ml/search.json
new file mode 100644
index 000000000..de2961ae7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "എല്ലാം",
+      "CONTACTS": "കോൺ‌ടാക്റ്റുകൾ",
+      "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "കോൺ‌ടാക്റ്റുകൾ",
+      "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "ബോട്ട്",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ms/report.json b/app/javascript/dashboard/i18n/locale/ms/report.json
index 37c8fed2c..7471ba7a9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/report.json
+++ b/app/javascript/dashboard/i18n/locale/ms/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/search.json b/app/javascript/dashboard/i18n/locale/ms/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ms/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/report.json b/app/javascript/dashboard/i18n/locale/ne/report.json
index 0bd9b544d..48dcccc2b 100644
--- a/app/javascript/dashboard/i18n/locale/ne/report.json
+++ b/app/javascript/dashboard/i18n/locale/ne/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/search.json b/app/javascript/dashboard/i18n/locale/ne/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/report.json b/app/javascript/dashboard/i18n/locale/nl/report.json
index 5bd7f3ea0..5b6388829 100644
--- a/app/javascript/dashboard/i18n/locale/nl/report.json
+++ b/app/javascript/dashboard/i18n/locale/nl/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Niet toegewezen"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Bezig",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/search.json b/app/javascript/dashboard/i18n/locale/nl/search.json
new file mode 100644
index 000000000..85013f4cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Allemaal",
+      "CONTACTS": "Contacten",
+      "CONVERSATIONS": "Gesprekken",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacten",
+      "CONVERSATIONS": "Gesprekken",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/report.json b/app/javascript/dashboard/i18n/locale/no/report.json
index cbb49f9e2..5c7d1b399 100644
--- a/app/javascript/dashboard/i18n/locale/no/report.json
+++ b/app/javascript/dashboard/i18n/locale/no/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Ikke tildelt"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Opptatt",
       "OFFLINE": "Frakoblet"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/search.json b/app/javascript/dashboard/i18n/locale/no/search.json
new file mode 100644
index 000000000..ec842ddfc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Alle",
+      "CONTACTS": "Kontakter",
+      "CONVERSATIONS": "Samtaler",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakter",
+      "CONVERSATIONS": "Samtaler",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index 59e8650c6..a57344556 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Nieprzypisane"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Zajęty",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/search.json b/app/javascript/dashboard/i18n/locale/pl/search.json
new file mode 100644
index 000000000..c304d544c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Wszystkie",
+      "CONTACTS": "Kontakty",
+      "CONVERSATIONS": "Rozmowy",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakty",
+      "CONVERSATIONS": "Rozmowy",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/report.json b/app/javascript/dashboard/i18n/locale/pt/report.json
index de908170d..5fccea58e 100644
--- a/app/javascript/dashboard/i18n/locale/pt/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Não atribuído"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Ocupado",
       "OFFLINE": "Ausente"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/search.json b/app/javascript/dashboard/i18n/locale/pt/search.json
new file mode 100644
index 000000000..be41e0c16
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "TODOS",
+      "CONTACTS": "Contactos",
+      "CONVERSATIONS": "Conversas",
+      "MESSAGES": "Mensagens"
+    },
+    "SECTION": {
+      "CONTACTS": "Contactos",
+      "CONVERSATIONS": "Conversas",
+      "MESSAGES": "Mensagens"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index 03e4bf5ad..db4550b5d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Não atendidas",
       "UNASSIGNED": "Não atribuída"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversas por agentes",
       "LOADING_MESSAGE": "Carregando métricas de agente...",
@@ -443,5 +449,14 @@
       "BUSY": "Ocupado",
       "OFFLINE": "Desconectado"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/search.json b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
new file mode 100644
index 000000000..7816b5fbd
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Todos",
+      "CONTACTS": "Contato",
+      "CONVERSATIONS": "Conversas",
+      "MESSAGES": "Mensagens"
+    },
+    "SECTION": {
+      "CONTACTS": "Contato",
+      "CONVERSATIONS": "Conversas",
+      "MESSAGES": "Mensagens"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/report.json b/app/javascript/dashboard/i18n/locale/ro/report.json
index 8f153fd84..3620f380d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/report.json
+++ b/app/javascript/dashboard/i18n/locale/ro/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Neatribuit"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Ocupat",
       "OFFLINE": "Deconectat"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/search.json b/app/javascript/dashboard/i18n/locale/ro/search.json
new file mode 100644
index 000000000..fee8babb7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Toate",
+      "CONTACTS": "Contacte",
+      "CONVERSATIONS": "Conversații",
+      "MESSAGES": "Mesaje"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacte",
+      "CONVERSATIONS": "Conversații",
+      "MESSAGES": "Mesaje"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index 6761063a1..42d9d013f 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Несвязанные",
       "UNASSIGNED": "Неназначен"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Диалоги по операторам",
       "LOADING_MESSAGE": "Загрузка метрик оператора...",
@@ -443,5 +449,14 @@
       "BUSY": "Занят",
       "OFFLINE": "Оффлайн"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/search.json b/app/javascript/dashboard/i18n/locale/ru/search.json
new file mode 100644
index 000000000..c5e5b3811
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Все",
+      "CONTACTS": "Контакты",
+      "CONVERSATIONS": "Диалоги",
+      "MESSAGES": "Сообщения"
+    },
+    "SECTION": {
+      "CONTACTS": "Контакты",
+      "CONVERSATIONS": "Диалоги",
+      "MESSAGES": "Сообщения"
+    },
+    "EMPTY_STATE": "Не найдено %{item} для запроса '%{query}'",
+    "EMPTY_STATE_FULL": "Ничего не найдено по запросу '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ фокусироваться",
+    "INPUT_PLACEHOLDER": "Поиск содержимого сообщения, контакта, имени электронной почты или телефонных разговоров",
+    "BOT_LABEL": "Бот",
+    "READ_MORE": "Читать далее",
+    "WROTE": "написал:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/report.json b/app/javascript/dashboard/i18n/locale/sk/report.json
index 20dfdcef5..bb722a0d4 100644
--- a/app/javascript/dashboard/i18n/locale/sk/report.json
+++ b/app/javascript/dashboard/i18n/locale/sk/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Nepriradené"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Zaneprázdnený",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/search.json b/app/javascript/dashboard/i18n/locale/sk/search.json
new file mode 100644
index 000000000..562334b1f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Všetko",
+      "CONTACTS": "Kontakty",
+      "CONVERSATIONS": "Rozhovory",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakty",
+      "CONVERSATIONS": "Rozhovory",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/report.json b/app/javascript/dashboard/i18n/locale/sr/report.json
index eb70e80a1..88b4bf569 100644
--- a/app/javascript/dashboard/i18n/locale/sr/report.json
+++ b/app/javascript/dashboard/i18n/locale/sr/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Nedodeljeni",
       "UNASSIGNED": "Nedodeljen"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Razgovori prema agentima",
       "LOADING_MESSAGE": "Učitavanje metrike agenata...",
@@ -443,5 +449,14 @@
       "BUSY": "Zauzet",
       "OFFLINE": "Nedostupan"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/search.json b/app/javascript/dashboard/i18n/locale/sr/search.json
new file mode 100644
index 000000000..6614a9d64
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Sve",
+      "CONTACTS": "Kontakti",
+      "CONVERSATIONS": "Razgovori",
+      "MESSAGES": "Poruke"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakti",
+      "CONVERSATIONS": "Razgovori",
+      "MESSAGES": "Poruke"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/report.json b/app/javascript/dashboard/i18n/locale/sv/report.json
index 3ff560b7d..20eefc001 100644
--- a/app/javascript/dashboard/i18n/locale/sv/report.json
+++ b/app/javascript/dashboard/i18n/locale/sv/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Otilldelade"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Upptagen",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/search.json b/app/javascript/dashboard/i18n/locale/sv/search.json
new file mode 100644
index 000000000..7b1900c2c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Alla",
+      "CONTACTS": "Kontakter",
+      "CONVERSATIONS": "Konversationer",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Kontakter",
+      "CONVERSATIONS": "Konversationer",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/report.json b/app/javascript/dashboard/i18n/locale/ta/report.json
index f00d26ea0..a9d11ab62 100644
--- a/app/javascript/dashboard/i18n/locale/ta/report.json
+++ b/app/javascript/dashboard/i18n/locale/ta/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "ஒதுக்கப்படாதது"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/search.json b/app/javascript/dashboard/i18n/locale/ta/search.json
new file mode 100644
index 000000000..d2c1e6643
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "எல்லாம்",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "உரையாடல்கள்",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "உரையாடல்கள்",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/report.json b/app/javascript/dashboard/i18n/locale/th/report.json
index 06ab2a40a..f5ab8f756 100644
--- a/app/javascript/dashboard/i18n/locale/th/report.json
+++ b/app/javascript/dashboard/i18n/locale/th/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "ไม่ได้เข้าร่วม",
       "UNASSIGNED": "ไม่ได้รับมอบหมาย"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "การสนทนาที่พนักงานดูแล",
       "LOADING_MESSAGE": "กำลังโหลดตัวชี้วัดพนักงาน",
@@ -443,5 +449,14 @@
       "BUSY": "ไม่ว่าง",
       "OFFLINE": "ออฟไลน์"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/search.json b/app/javascript/dashboard/i18n/locale/th/search.json
new file mode 100644
index 000000000..73baf18b0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "ทั้งหมด",
+      "CONTACTS": "ผู้ติดต่อ",
+      "CONVERSATIONS": "การสนทนา",
+      "MESSAGES": "ข้อความทั้งหมด"
+    },
+    "SECTION": {
+      "CONTACTS": "ผู้ติดต่อ",
+      "CONVERSATIONS": "การสนทนา",
+      "MESSAGES": "ข้อความทั้งหมด"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "บอท",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/report.json b/app/javascript/dashboard/i18n/locale/tr/report.json
index 3a416f0d1..ce9442b4f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/report.json
+++ b/app/javascript/dashboard/i18n/locale/tr/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Atanmamış"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Temsilci metrikleri yükleniyor...",
@@ -443,5 +449,14 @@
       "BUSY": "Meşgul",
       "OFFLINE": "Çevirimdışı"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/search.json b/app/javascript/dashboard/i18n/locale/tr/search.json
new file mode 100644
index 000000000..4cda5d3bc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Hepsi",
+      "CONTACTS": "Kişiler",
+      "CONVERSATIONS": "Konuşmalar",
+      "MESSAGES": "Mesajlar"
+    },
+    "SECTION": {
+      "CONTACTS": "Kişiler",
+      "CONVERSATIONS": "Konuşmalar",
+      "MESSAGES": "Mesajlar"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/report.json b/app/javascript/dashboard/i18n/locale/uk/report.json
index 14f863157..831160a12 100644
--- a/app/javascript/dashboard/i18n/locale/uk/report.json
+++ b/app/javascript/dashboard/i18n/locale/uk/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Не зв'язаний",
       "UNASSIGNED": "Непризначені"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Розмови агентів",
       "LOADING_MESSAGE": "Завантаження метрик агента...",
@@ -443,5 +449,14 @@
       "BUSY": "Зайнятий",
       "OFFLINE": "Не в мережі"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/search.json b/app/javascript/dashboard/i18n/locale/uk/search.json
new file mode 100644
index 000000000..7049ce33a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Всі",
+      "CONTACTS": "Контакти",
+      "CONVERSATIONS": "Бесіди",
+      "MESSAGES": "Текст повідомлень"
+    },
+    "SECTION": {
+      "CONTACTS": "Контакти",
+      "CONVERSATIONS": "Бесіди",
+      "MESSAGES": "Текст повідомлень"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Бот",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/report.json b/app/javascript/dashboard/i18n/locale/ur/report.json
index aab038eb0..6b4ff6e2e 100644
--- a/app/javascript/dashboard/i18n/locale/ur/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "نا مقرر کیا ہوا"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/search.json b/app/javascript/dashboard/i18n/locale/ur/search.json
new file mode 100644
index 000000000..8a6ab8074
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "تمام",
+      "CONTACTS": "کانٹیکٹس",
+      "CONVERSATIONS": "مکالمات",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "کانٹیکٹس",
+      "CONVERSATIONS": "مکالمات",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/report.json b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
index 0bd9b544d..48dcccc2b 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "Busy",
       "OFFLINE": "Offline"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/search.json b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
new file mode 100644
index 000000000..f3823f134
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "All",
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "SECTION": {
+      "CONTACTS": "Contacts",
+      "CONVERSATIONS": "Conversations",
+      "MESSAGES": "Messages"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/report.json b/app/javascript/dashboard/i18n/locale/vi/report.json
index 13351e95d..6dd799a59 100644
--- a/app/javascript/dashboard/i18n/locale/vi/report.json
+++ b/app/javascript/dashboard/i18n/locale/vi/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Không giám sát",
       "UNASSIGNED": "Chưa được phân công"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Cuộc hội thoại của các tổng đài viên",
       "LOADING_MESSAGE": "Đang tải chỉ số tổng đài viên...",
@@ -443,5 +449,14 @@
       "BUSY": "Bận",
       "OFFLINE": "Không Trực Tuyến"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/search.json b/app/javascript/dashboard/i18n/locale/vi/search.json
new file mode 100644
index 000000000..03cd14b35
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "Tất cả",
+      "CONTACTS": "Danh bạ",
+      "CONVERSATIONS": "Các cuộc hội thoại",
+      "MESSAGES": "Tin nhắn"
+    },
+    "SECTION": {
+      "CONTACTS": "Danh bạ",
+      "CONVERSATIONS": "Các cuộc hội thoại",
+      "MESSAGES": "Tin nhắn"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "Bot",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/report.json b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
index 49cd1e32d..966299ea9 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "未分配的"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "忙碌中",
       "OFFLINE": "离线的"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/search.json b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
new file mode 100644
index 000000000..53db0dd37
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "所有的",
+      "CONTACTS": "联系人",
+      "CONVERSATIONS": "会话",
+      "MESSAGES": "消息"
+    },
+    "SECTION": {
+      "CONTACTS": "联系人",
+      "CONVERSATIONS": "会话",
+      "MESSAGES": "消息"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "机器人",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/report.json b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
index 2f7d08b19..ded50d04f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
@@ -426,6 +426,12 @@
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "未指派的"
     },
+    "CONVERSATION_HEATMAP": {
+      "HEADER": "Conversation Traffic",
+      "NO_CONVERSATIONS": "No conversations",
+      "CONVERSATION": "%{count} conversation",
+      "CONVERSATIONS": "%{count} conversations"
+    },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
@@ -443,5 +449,14 @@
       "BUSY": "忙碌中",
       "OFFLINE": "離線的"
     }
+  },
+  "DAYS_OF_WEEK": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/search.json b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
new file mode 100644
index 000000000..49123b44b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
@@ -0,0 +1,22 @@
+{
+  "SEARCH": {
+    "TABS": {
+      "ALL": "所有的",
+      "CONTACTS": "聯絡人",
+      "CONVERSATIONS": "對話",
+      "MESSAGES": "訊息"
+    },
+    "SECTION": {
+      "CONTACTS": "聯絡人",
+      "CONVERSATIONS": "對話",
+      "MESSAGES": "訊息"
+    },
+    "EMPTY_STATE": "No %{item} found for query '%{query}'",
+    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "BOT_LABEL": "機器人",
+    "READ_MORE": "Read more",
+    "WROTE": "wrote:"
+  }
+}
diff --git a/app/javascript/survey/i18n/locale/hy.json b/app/javascript/survey/i18n/locale/hy.json
new file mode 100644
index 000000000..2473f114e
--- /dev/null
+++ b/app/javascript/survey/i18n/locale/hy.json
@@ -0,0 +1,19 @@
+{
+  "SURVEY": {
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "RATING": {
+      "LABEL": "Rate your conversation",
+      "SUCCESS_MESSAGE": "Thank you for submitting the rating"
+    },
+    "FEEDBACK": {
+      "LABEL": "Do you have any thoughts you'd like to share?",
+      "PLACEHOLDER": "Your feedback (optional)",
+      "BUTTON_TEXT": "Submit feedback"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  },
+  "POWERED_BY": "Powered by Chatwoot"
+}
diff --git a/app/javascript/widget/i18n/locale/hy.json b/app/javascript/widget/i18n/locale/hy.json
new file mode 100644
index 000000000..0c286263d
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/hy.json
@@ -0,0 +1,97 @@
+{
+  "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",
+  "END_CONVERSATION": "End 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",
+        "REQUIRED_ERROR": "Full Name is required"
+      },
+      "EMAIL_ADDRESS": {
+        "LABEL": "Email Address",
+        "PLACEHOLDER": "Please enter your email address",
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Please enter a valid email address"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Phone Number",
+        "PLACEHOLDER": "Please enter your phone number",
+        "REQUIRED_ERROR": "Phone Number is required",
+        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Please enter your message",
+        "ERROR": "Message too short"
+      }
+    },
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required",
+    "REQUIRED": "Required"
+  },
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  },
+  "EMOJI": {
+    "PLACEHOLDER": "Search emojis",
+    "NOT_FOUND": "No emoji match your search"
+  },
+  "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"
+  },
+  "INTEGRATIONS": {
+    "DYTE": {
+      "CLICK_HERE_TO_JOIN": "Click here to join",
+      "LEAVE_THE_ROOM": "Leave the call"
+    }
+  }
+}
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9cba7f345..395560ad8 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -133,7 +133,7 @@ ar:
           reply_with_name: '%{assignee_name} من %{inbox_name} <%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} من %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "رسائل جديدة في هذه المحادثة"
       transcript_subject: "نص المحادثة"
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 3ab0fa623..b65e15575 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -133,7 +133,7 @@ bg:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f6be8f0a3..0b2f43bdf 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -133,7 +133,7 @@ ca:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Missatges nous en aquesta conversa"
       transcript_subject: "Transcripció de conversa"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 58a895b28..56662e6af 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -133,7 +133,7 @@ cs:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nové zprávy v této konverzaci"
       transcript_subject: "Přepis konverzace"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 9cb89fb9d..e2a0990ac 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -133,7 +133,7 @@ da:
           reply_with_name: '%{assignee_name} fra %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} fra %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nye beskeder i denne samtale"
       transcript_subject: "Samtaleudskrift"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7894e26f9..4181e554b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -133,7 +133,7 @@ de:
           reply_with_name: '%{assignee_name} von %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} von %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Neue Nachrichten in dieser Unterhaltung"
       transcript_subject: "Gesprächsprotokoll"
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
new file mode 100644
index 000000000..718d825cf
--- /dev/null
+++ b/config/locales/devise.hy.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+hy:
+  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:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 9c9bd84ca..4ffbd32f2 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -133,7 +133,7 @@ el:
           reply_with_name: '%{assignee_name} από %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} από %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "νέα μηνύματα σε αυτήν την συνομιλία"
       transcript_subject: "Μεταγραφή Συνομιλίας"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d77d9f46c..2f8b1dfb3 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -133,7 +133,7 @@ es:
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} de %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nuevos mensajes en esta conversación"
       transcript_subject: "Transcripción de la conversación"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 51b74a2d5..a79863c87 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -133,7 +133,7 @@ fa:
           reply_with_name: '%{assignee_name} از %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} از <%{from_email}>'
+          reply_with_name: '%{assignee_name} از %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "پیام‌های جدید در این مکالمه"
       transcript_subject: "متن مکالمه"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 545ad498a..1cda2927e 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -133,7 +133,7 @@ fi:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Uusia viestejä"
       transcript_subject: "Keskustelukopio"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 98f01955f..10fa3bcd5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -133,7 +133,7 @@ fr:
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} de %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nouveaux messages dans cette conversation"
       transcript_subject: "Transcription de conversation"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index e034ccd42..b65c28085 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -133,7 +133,7 @@ he:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 138959b3f..25d130b02 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -133,7 +133,7 @@ hi:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 14b17248b..aa9caa602 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -133,7 +133,7 @@ hu:
           reply_with_name: '%{assignee_name} innen %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} innen %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Új üzenet a beszélgetésben"
       transcript_subject: "Beszélgetés kivonat"
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
new file mode 100644
index 000000000..6031ceacd
--- /dev/null
+++ b/config/locales/hy.yml
@@ -0,0 +1,183 @@
+#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.
+hy:
+  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:
+    validations:
+      presence: must not be blank
+    webhook:
+      invalid: Invalid events
+    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
+    data_import:
+      data_type:
+        invalid: Invalid data type
+    contacts:
+      import:
+        failed: File is blank
+      email:
+        invalid: Invalid email
+      phone_number:
+        invalid: should be in e164 format
+    categories:
+      locale:
+        unique: should be unique in the category and portal
+    dyte:
+      invalid_message_type: "Invalid message type. Action not permitted"
+    inboxes:
+      imap:
+        socket_error: Please check the network connection, IMAP address and try again.
+        no_response_error: Please check the IMAP credentials and try again.
+        host_unreachable_error: Host unreachable, Please check the IMAP address, IMAP port and try again.
+        connection_timed_out_error: Connection timed out for %{address}:%{port}
+        connection_closed_error: Connection closed.
+      validations:
+        name: should not start or end with symbols, and it should not have < > / \ @ characters.
+  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)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      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)
+    default_group_by: day
+    csat:
+      headers:
+        contact_name: Contact Name
+        contact_email_address: Contact Email Address
+        contact_phone_number: Contact Phone Number
+        link_to_the_conversation: Link to the conversation
+        agent_name: Agent Name
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
+  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:
+      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_deleted_story_content: This story is no longer available.
+      deleted: This message was deleted
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        contact_resolved: "Conversation was resolved by %{contact_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}>'
+      channel_email:
+        header:
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
+          reply_with_inbox_name: '%{inbox_name} <%{from_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:
+    dyte:
+      name: "Dyte"
+      description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
+      meeting_name: "%{agent_name} has started a meeting"
+    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."
+    google_translate:
+      name: "Google Translate"
+      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+  public_portal:
+    search:
+      search_placeholder: Search for article by title or body...
+      empty_placeholder: No results found.
+      loading_placeholder: Searching...
+      results_title: Search results
+    hero:
+      sub_title: Search for the articles here or browse the categories below.
+    common:
+      home: Home
+      last_updated_on: Last updated on %{last_updated_on}
+      view_all_articles: View all articles
+      article: article
+      articles: articles
+      no_articles: There are no articles here
+    footer:
+      made_with: Made with
+    header:
+      go_to_homepage: Go to the main site
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 6e9a1be81..1e847951a 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -133,7 +133,7 @@ id:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Pesan baru pada percakapan ini"
       transcript_subject: "Transkrip Percakapan"
diff --git a/config/locales/is.yml b/config/locales/is.yml
index bfaf4b6fb..73164dfe6 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -133,7 +133,7 @@ is:
           reply_with_name: '%{assignee_name} frá %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} frá %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 0f3f9fcab..82b258a5c 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -133,7 +133,7 @@ it:
           reply_with_name: '%{assignee_name} da %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} da %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nuovi messaggi in questa conversazione"
       transcript_subject: "Trascrizione della conversazione"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 04481be2f..0df5cabb5 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -133,7 +133,7 @@ ja:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "この会話に新着メッセージがあります"
       transcript_subject: "会話の記録"
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 9ab73ee39..6bdd0b2b1 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -133,7 +133,7 @@ ka:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e9a926d38..87fe66409 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -133,7 +133,7 @@ ko:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index c52417b7b..6e0c6437d 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -133,7 +133,7 @@ lt:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e4484167e..b0c6cca38 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -133,7 +133,7 @@ lv:
           reply_with_name: '%{assignee_name} no %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} no <%{from_email}>'
+          reply_with_name: '%{assignee_name} no %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Jauni ziņojumi šajā sarunā"
       transcript_subject: "Sarunas Transkripts"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 1e7e376e5..f0ecdee34 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -133,7 +133,7 @@ ml:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "ഈ സംഭാഷണത്തിലെ പുതിയ സന്ദേശങ്ങൾ"
       transcript_subject: "സംഭാഷണ ട്രാൻസ്ക്രിപ്റ്റ്"
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 309552e81..b281cec7b 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -133,7 +133,7 @@ ms:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 307b8d361..3c4a48d24 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -133,7 +133,7 @@ ne:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 08dabf0d9..d2077551d 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -133,7 +133,7 @@ nl:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 8a2ba6608..ef5e4d914 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -133,7 +133,7 @@
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nye meldinger i denne samtalen"
       transcript_subject: "Kopi av samtale"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8254b056c..3a0a26463 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -133,7 +133,7 @@ pl:
           reply_with_name: '%{assignee_name} z %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} z %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nowe wiadomości w tej dyskusji"
       transcript_subject: "Transkrypcja rozmowy"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 134ebfae9..6fc3b217d 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -133,7 +133,7 @@ pt:
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} de %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Novas mensagens nesta conversa"
       transcript_subject: "Transcrição da conversa"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index ce39c1c77..456d5b7da 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -133,7 +133,7 @@ pt_BR:
           reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} do <%{from_email}>'
+          reply_with_name: '%{assignee_name} de %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Novas mensagens nesta conversa"
       transcript_subject: "Transcrição da conversa"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b7ef52f11..54182a97f 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -133,7 +133,7 @@ ro:
           reply_with_name: '%{assignee_name} din %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} din %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Mesaje noi în această conversație"
       transcript_subject: "Trimite Transcriere"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 93e331f76..0b850863b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -133,7 +133,7 @@ ru:
           reply_with_name: '%{assignee_name} от %{inbox_name} <%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} от <%{from_email}>'
+          reply_with_name: '%{assignee_name} от %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Новые сообщения в этом диалоге"
       transcript_subject: "Субтитры общения"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b2369e20d..004499ddb 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -133,7 +133,7 @@ sk:
           reply_with_name: '%{assignee_name} z %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} z %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nové správy v tejto konverzácii"
       transcript_subject: "Prepis konverzácie"
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 66c8988f6..ef2217084 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -133,7 +133,7 @@ sr-Latn:
           reply_with_name: '%{assignee_name} iz %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} iz %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nove poruke u ovom razgovoru"
       transcript_subject: "Transkript razgovora"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 501e70da4..6e9e0f51d 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -133,7 +133,7 @@ sv:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Nya meddelanden i denna konversation"
       transcript_subject: "Konversationstranskribering"
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 6a4c01661..a5327c93b 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -133,7 +133,7 @@ ta:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "இந்த உரையாடலில் புதிய செய்திகள்"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index a15d6cc0f..d20d24bd2 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -133,7 +133,7 @@ th:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index b53e1248f..bbae62f70 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -133,7 +133,7 @@ tr:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Bu görüşmedeki yeni mesajlar"
       transcript_subject: "Konuşma Metni"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 0d85549a7..bd0ab21d7 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -133,7 +133,7 @@ uk:
           reply_with_name: '%{assignee_name} від %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} від %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "Нові повідомлення в цьому діалозі"
       transcript_subject: "Транскрипція діалогу"
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index fd7d79e5e..3715db715 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -133,7 +133,7 @@ ur:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 2f8264fed..e9ce50818 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -133,7 +133,7 @@ ur:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 81f2ccadd..2874b1301 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -133,7 +133,7 @@ vi:
           reply_with_name: '%{assignee_name} từ %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} từ %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_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"
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index b6ffa0185..1883f60e7 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -133,7 +133,7 @@ zh_CN:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "此对话中的新消息"
       transcript_subject: "Conversation Transcript"
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 262c4f98e..b2d35573e 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -133,7 +133,7 @@ zh_TW:
           reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from <%{from_email}>'
+          reply_with_name: '%{assignee_name} from %{inbox_name}'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: "在對話中的新訊息"
       transcript_subject: "對話紀錄"

From 5166fd89488544fa50aaeebfcf3bd520a4703fb6 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Mar 2023 17:40:21 +0530
Subject: [PATCH 68/94] chore: Update gems (#6628)

- Updating gems based on ruby advisory warnings
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2664d64b2..0d917a500 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -509,7 +509,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.6.1)
-    rack (2.2.6.2)
+    rack (2.2.6.3)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)

From d59fd6b747b4c26cb2749a2c93c01c0c81eb5534 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Mar 2023 18:01:00 +0530
Subject: [PATCH 69/94] chore: Ensure Template messages work even when bot is
 connected (#6455)

ref: #5592
---
 app/services/message_templates/hook_execution_service.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index 5bffb881b..9315a889e 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -2,7 +2,6 @@ class MessageTemplates::HookExecutionService
   pattr_initialize [:message!]
 
   def perform
-    return if inbox.agent_bot_inbox&.active?
     return if conversation.campaign.present?
 
     trigger_templates

From 0fe05dc1b96cbbf66d2e438014067d164f7932b8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 8 Mar 2023 18:11:07 +0530
Subject: [PATCH 70/94] feat: add trigram index to tags (#6615)

Fixes: chatwoot/product#796

This migration adds a trigram index to the tags table on the name column. This is used to speed up the search for tags by name, this is a heavy sub-query when generating reports where labels are involved.

Trigram indexes are used to speed up LIKE queries; they are not used for equality queries. This is because the index is not a btree index, it is a GIN index. This means that the index is not ordered and so cannot be used for equality queries.

Read more: https://www.postgresql.org/docs/current/pgtrgm.html

The index is created concurrently: https://thoughtbot.com/blog/how-to-create-postgres-indexes-concurrently-in
---------

Co-authored-by: Sojan <sojan@pepalo.com>
---
 ...230306100327_add_trgm_index_to_tag_name.rb | 21 +++++++++
 db/schema.rb                                  | 43 ++++++++++---------
 2 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 db/migrate/20230306100327_add_trgm_index_to_tag_name.rb

diff --git a/db/migrate/20230306100327_add_trgm_index_to_tag_name.rb b/db/migrate/20230306100327_add_trgm_index_to_tag_name.rb
new file mode 100644
index 000000000..d5ba0c8e1
--- /dev/null
+++ b/db/migrate/20230306100327_add_trgm_index_to_tag_name.rb
@@ -0,0 +1,21 @@
+# This migration adds a trigram index to the tags table on the name column.
+# This is used to speed up the search for tags by name, this is a heavy
+# sub query when genereating reports where labels are involved.
+#
+# Trigram indexes are used to speed up LIKE queries, they are not used for
+# equality queries. This is because the index is not a btree index, it is a
+# GIN index. This means that the index is not ordered, and so cannot be used
+# for equality queries.
+#
+# Read more: https://www.postgresql.org/docs/current/pgtrgm.html
+
+class AddTrgmIndexToTagName < ActiveRecord::Migration[6.1]
+  # disabling ddl transaction is required for concurrent index creation
+  # https://thoughtbot.com/blog/how-to-create-postgres-indexes-concurrently-in
+  disable_ddl_transaction!
+
+  def change
+    add_index :tags, 'LOWER(name) gin_trgm_ops', using: :gin, name: 'tags_name_trgm_idx', algorithm: :concurrently
+    # resolves to CREATE INDEX tags_name_trgm_idx ON public.tags USING gin (lower((name)::text) gin_trgm_ops);
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f1c645102..991f5afb4 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: 2023_03_02_054408) do
+ActiveRecord::Schema.define(version: 2023_03_06_100327) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -153,26 +153,26 @@ ActiveRecord::Schema.define(version: 2023_03_02_054408) do
     t.index ["message_id"], name: "index_attachments_on_message_id"
   end
 
-  create_table 'audits', force: :cascade do |t|
-    t.bigint 'auditable_id'
-    t.string 'auditable_type'
-    t.bigint 'associated_id'
-    t.string 'associated_type'
-    t.bigint 'user_id'
-    t.string 'user_type'
-    t.string 'username'
-    t.string 'action'
-    t.jsonb 'audited_changes'
-    t.integer 'version', default: 0
-    t.string 'comment'
-    t.string 'remote_address'
-    t.string 'request_uuid'
-    t.datetime 'created_at'
-    t.index %w[associated_type associated_id], name: 'associated_index'
-    t.index %w[auditable_type auditable_id version], name: 'auditable_index'
-    t.index ['created_at'], name: 'index_audits_on_created_at'
-    t.index ['request_uuid'], name: 'index_audits_on_request_uuid'
-    t.index %w[user_id user_type], name: 'user_index'
+  create_table "audits", force: :cascade do |t|
+    t.bigint "auditable_id"
+    t.string "auditable_type"
+    t.bigint "associated_id"
+    t.string "associated_type"
+    t.bigint "user_id"
+    t.string "user_type"
+    t.string "username"
+    t.string "action"
+    t.jsonb "audited_changes"
+    t.integer "version", default: 0
+    t.string "comment"
+    t.string "remote_address"
+    t.string "request_uuid"
+    t.datetime "created_at"
+    t.index ["associated_type", "associated_id"], name: "associated_index"
+    t.index ["auditable_type", "auditable_id", "version"], name: "auditable_index"
+    t.index ["created_at"], name: "index_audits_on_created_at"
+    t.index ["request_uuid"], name: "index_audits_on_request_uuid"
+    t.index ["user_id", "user_type"], name: "user_index"
   end
 
   create_table "automation_rules", force: :cascade do |t|
@@ -816,6 +816,7 @@ ActiveRecord::Schema.define(version: 2023_03_02_054408) do
   create_table "tags", id: :serial, force: :cascade do |t|
     t.string "name"
     t.integer "taggings_count", default: 0
+    t.index "lower((name)::text) gin_trgm_ops", name: "tags_name_trgm_idx", using: :gin
     t.index ["name"], name: "index_tags_on_name", unique: true
   end
 

From eb4da33cdc82260ec76ffe157c505323d4ab4589 Mon Sep 17 00:00:00 2001
From: Clairton Rodrigo Heinzen <clairton.rodrigo@gmail.com>
Date: Wed, 8 Mar 2023 09:53:25 -0300
Subject: [PATCH 71/94] feat: Ability to customize the base url for Whatsapp
 Cloud Service (#6622)

Configure a custom endpoint for Whatsapp Cloud Service via `WHATSAPP_CLOUD_BASE_URL`.

refs:  #5142
---
 .../whatsapp/providers/whatsapp_cloud_service.rb       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index 8ca1a9672..04ddc8f02 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -37,18 +37,22 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
   end
 
   def media_url(media_id)
-    "https://graph.facebook.com/v13.0/#{media_id}"
+    "#{api_base_path}/v13.0/#{media_id}"
   end
 
   private
 
+  def api_base_path
+    ENV.fetch('WHATSAPP_CLOUD_BASE_URL', 'https://graph.facebook.com')
+  end
+
   # TODO: See if we can unify the API versions and for both paths and make it consistent with out facebook app API versions
   def phone_id_path
-    "https://graph.facebook.com/v13.0/#{whatsapp_channel.provider_config['phone_number_id']}"
+    "#{api_base_path}/v13.0/#{whatsapp_channel.provider_config['phone_number_id']}"
   end
 
   def business_account_path
-    "https://graph.facebook.com/v14.0/#{whatsapp_channel.provider_config['business_account_id']}"
+    "#{api_base_path}/v14.0/#{whatsapp_channel.provider_config['business_account_id']}"
   end
 
   def send_text_message(phone_number, message)

From 9bc0f67f5424afe1cda339c8c95cced38f6a5718 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Mar 2023 18:38:54 +0530
Subject: [PATCH 72/94] feat: Add specs for `WHATSAPP_CLOUD_BASE_URL` env
 variable (#6630)

ref: #6622
---
 .../providers/whatsapp_cloud_service_spec.rb     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
index 4cc7bcdd5..ce0c7ae34 100644
--- a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
@@ -133,4 +133,20 @@ describe Whatsapp::Providers::WhatsappCloudService do
       end
     end
   end
+
+  describe 'Ability to configure Base URL' do
+    context 'when environment variable WHATSAPP_CLOUD_BASE_URL is not set' do
+      it 'uses the default base url' do
+        expect(subject.send(:api_base_path)).to eq('https://graph.facebook.com')
+      end
+    end
+
+    context 'when environment variable WHATSAPP_CLOUD_BASE_URL is set' do
+      it 'uses the base url from the environment variable' do
+        with_modified_env WHATSAPP_CLOUD_BASE_URL: 'http://test.com' do
+          expect(subject.send(:api_base_path)).to eq('http://test.com')
+        end
+      end
+    end
+  end
 end

From c20410f3f4dd2b188e2741f046649d5c53cebf5c Mon Sep 17 00:00:00 2001
From: CristianDuta <cristian.duta90@gmail.com>
Date: Wed, 8 Mar 2023 14:12:49 +0100
Subject: [PATCH 73/94] feat: Ability to update CSAT over Client APIs (#6470)

This PR allows updating CSAT over Client APIs.

ref: #6328

Co-authored-by: Cristian Duta <Cristian.Duta@ti8m.ch>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../api/v1/inboxes/messages_controller.rb     |  8 ++++-
 .../api/v1/inbox/messages_controller_spec.rb  | 32 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/controllers/public/api/v1/inboxes/messages_controller.rb b/app/controllers/public/api/v1/inboxes/messages_controller.rb
index 925c16d38..4dc780fff 100644
--- a/app/controllers/public/api/v1/inboxes/messages_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/messages_controller.rb
@@ -12,6 +12,8 @@ class Public::Api::V1::Inboxes::MessagesController < Public::Api::V1::InboxesCon
   end
 
   def update
+    render json: { error: 'You cannot update the CSAT survey after 14 days' }, status: :unprocessable_entity and return if check_csat_locked
+
     @message.update!(message_update_params)
   rescue StandardError => e
     render json: { error: @contact.errors, message: e.message }.to_json, status: :internal_server_error
@@ -43,7 +45,7 @@ class Public::Api::V1::Inboxes::MessagesController < Public::Api::V1::InboxesCon
   end
 
   def message_update_params
-    params.permit(submitted_values: [:name, :title, :value])
+    params.permit(submitted_values: [:name, :title, :value, { csat_survey_response: [:feedback_message, :rating] }])
   end
 
   def permitted_params
@@ -64,4 +66,8 @@ class Public::Api::V1::Inboxes::MessagesController < Public::Api::V1::InboxesCon
       message_type: :incoming
     }
   end
+
+  def check_csat_locked
+    (Time.zone.now.to_date - @message.created_at.to_date).to_i > 14 and @message.content_type == 'input_csat'
+  end
 end
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 5ad9e91ef..5916b7fb7 100644
--- a/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/messages_controller_spec.rb
@@ -55,7 +55,7 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
   end
 
   describe 'PATCH /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations/{conversation_id}/messages/{id}' do
-    it 'creates a message in the conversation' do
+    it 'updates a message in the conversation' do
       message = create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation)
       patch "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/" \
             "#{conversation.display_id}/messages/#{message.id}",
@@ -65,5 +65,35 @@ RSpec.describe 'Public Inbox Contact Conversation Messages API', type: :request
       data = JSON.parse(response.body)
       expect(data['content_attributes']['submitted_values'].first['title']).to eq 'test'
     end
+
+    it 'updates CSAT survey response for the conversation' do
+      message = create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content_type: 'input_csat')
+      # since csat survey is created in async job, we are mocking the creation.
+      create(:csat_survey_response, conversation: conversation, message: message, rating: 4, feedback_message: 'amazing experience')
+
+      patch "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/" \
+            "#{conversation.display_id}/messages/#{message.id}",
+            params: { submitted_values: { csat_survey_response: { rating: 4, feedback_message: 'amazing experience' } } },
+            as: :json
+
+      expect(response).to have_http_status(:success)
+      data = JSON.parse(response.body)
+      expect(data['content_attributes']['submitted_values']['csat_survey_response']['feedback_message']).to eq 'amazing experience'
+      expect(data['content_attributes']['submitted_values']['csat_survey_response']['rating']).to eq 4
+    end
+
+    it 'returns update error if CSAT message sent more than 14 days' do
+      message = create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content_type: 'input_csat',
+                                 created_at: 15.days.ago)
+      # since csat survey is created in async job, we are mocking the creation.
+      create(:csat_survey_response, conversation: conversation, message: message, rating: 4, feedback_message: 'amazing experience')
+
+      patch "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/" \
+            "#{conversation.display_id}/messages/#{message.id}",
+            params: { submitted_values: { csat_survey_response: { rating: 4, feedback_message: 'amazing experience' } } },
+            as: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+    end
   end
 end

From dd8f8fc845b84086d3075b126e5731ca191df590 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 8 Mar 2023 20:50:59 +0530
Subject: [PATCH 74/94] chore: Disable error tracking for Whatsapp error
 webhooks (#6627)

https://developers.facebook.com/docs/whatsapp/on-premises/webhooks/components

We are not going to handle the WhatsApp error component webhook event.

https://chatwoot-p3.sentry.io/issues/3957884597/?project=4504723538771968&query=is%3Aunresolved&referrer=issue-stream

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../whatsapp/incoming_message_base_service.rb |  2 ++
 .../incoming_message_service_helpers.rb       |  8 +++++
 ...ing_message_whatsapp_cloud_service_spec.rb | 36 +++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 124fad79d..83a82a3b1 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -56,6 +56,8 @@ class Whatsapp::IncomingMessageBaseService
     return if unprocessable_message_type?(message_type)
 
     message = @processed_params[:messages].first
+    log_error(message) && return if error_webhook_event?(message)
+
     if message_type == 'contacts'
       create_contact_messages(message)
     else
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index 6716fc1b2..cdf260b4a 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -46,4 +46,12 @@ module Whatsapp::IncomingMessageServiceHelpers
   def unprocessable_message_type?(message_type)
     %w[reaction ephemeral unsupported].include?(message_type)
   end
+
+  def error_webhook_event?(message)
+    message.key?('errors')
+  end
+
+  def log_error(message)
+    Rails.logger.warn "Whatsapp Error: #{message['errors'][0]['title']} - contact: #{message['from']}"
+  end
 end
diff --git a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
index 5498f2b8c..87dde6b53 100644
--- a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
@@ -27,6 +27,35 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do
       }.with_indifferent_access
     end
 
+    let(:error_params) do
+      {
+        phone_number: whatsapp_channel.phone_number,
+        object: 'whatsapp_business_account',
+        entry: [{
+          changes: [{
+            value: {
+              contacts: [{ profile: { name: 'Sojan Jose' }, wa_id: '2423423243' }],
+              messages: [{
+                from: '2423423243',
+                image: {
+                  id: 'b1c68f38-8734-4ad3-b4a1-ef0c10d683',
+                  mime_type: 'image/jpeg',
+                  sha256: '29ed500fa64eb55fc19dc4124acb300e5dcca0f822a301ae99944db',
+                  caption: 'Check out my product!'
+                },
+                errors: [{
+                  code: 400,
+                  details: 'Last error was: ServerThrottle. Http request error: HTTP response code said error. See logs for details',
+                  title: 'Media download failed: Not retrying as download is not retriable at this time'
+                }],
+                timestamp: '1664799904', type: 'image'
+              }]
+            }
+          }]
+        }]
+      }.with_indifferent_access
+    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(
@@ -65,6 +94,13 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do
         expect(whatsapp_channel.inbox.messages.first.attachments.present?).to be false
         expect(whatsapp_channel.authorization_error_count).to eq(1)
       end
+
+      it 'with attachment errors' do
+        described_class.new(inbox: whatsapp_channel.inbox, params: error_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.count).to eq(0)
+      end
     end
   end
 end

From 4673cf8cf157fd7288a711741cf57544eac504a7 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 9 Mar 2023 00:40:38 +0530
Subject: [PATCH 75/94] fix: timing in the API (#6633)

* fix: timing in the API

* test: fix params
---
 app/javascript/dashboard/api/reports.js            | 8 ++++----
 app/javascript/dashboard/api/specs/reports.spec.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index 6b3249e25..29fefeec8 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -10,8 +10,8 @@ class ReportsAPI extends ApiClient {
 
   getReports({
     metric,
-    since,
-    until,
+    from,
+    to,
     type = 'account',
     id,
     group_by,
@@ -20,8 +20,8 @@ class ReportsAPI extends ApiClient {
     return axios.get(`${this.url}`, {
       params: {
         metric,
-        since,
-        until,
+        since: from,
+        until: to,
         type,
         id,
         group_by,
diff --git a/app/javascript/dashboard/api/specs/reports.spec.js b/app/javascript/dashboard/api/specs/reports.spec.js
index 602e5a67d..b59a23ad5 100644
--- a/app/javascript/dashboard/api/specs/reports.spec.js
+++ b/app/javascript/dashboard/api/specs/reports.spec.js
@@ -22,8 +22,8 @@ describe('#Reports API', () => {
     it('#getAccountReports', () => {
       reportsAPI.getReports({
         metric: 'conversations_count',
-        since: 1621103400,
-        until: 1621621800,
+        from: 1621103400,
+        to: 1621621800,
       });
       expect(context.axiosMock.get).toHaveBeenCalledWith('/api/v2/reports', {
         params: {

From 757e1bb1f7c708aa766f21f5954b1b01cc2a28da Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 9 Mar 2023 13:50:26 +0530
Subject: [PATCH 76/94] fix: String interpolation (#6635)

---
 config/locales/en.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad1fbc6cf..d395cb54f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -145,12 +145,12 @@ en:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:

From 54b7c98795f20a58ed90707a394b906e82d8f1b5 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 9 Mar 2023 13:51:10 +0530
Subject: [PATCH 77/94] fix: Warn Facebook error code 100-2018218 (#6632)

---
 .../messages/facebook/message_builder.rb      |  6 +++++-
 .../messages/facebook/message_builder_spec.rb | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index 42d567e54..e0343c0a0 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -116,7 +116,11 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
       result = {}
       # OAuthException, code: 100, error_subcode: 2018218, message: (#100) No profile available for this user
       # We don't need to capture this error as we don't care about contact params in case of echo messages
-      ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception unless @outgoing_echo
+      if e.message.include?('2018218')
+        Rails.logger.warn e
+      else
+        ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception unless @outgoing_echo
+      end
     rescue StandardError => e
       result = {}
       ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
diff --git a/spec/builders/messages/facebook/message_builder_spec.rb b/spec/builders/messages/facebook/message_builder_spec.rb
index bb08bd9b6..082510f7b 100644
--- a/spec/builders/messages/facebook/message_builder_spec.rb
+++ b/spec/builders/messages/facebook/message_builder_spec.rb
@@ -39,5 +39,24 @@ describe  ::Messages::Facebook::MessageBuilder do
 
       expect(facebook_channel.authorization_error_count).to eq(2)
     end
+
+    it 'raises exception for non profile account' do
+      allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+      allow(fb_object).to receive(:get_object).and_raise(Koala::Facebook::ClientError.new(400, '',
+                                                                                          {
+                                                                                            'type' => 'OAuthException',
+                                                                                            'message' => '(#100) No profile available for this user.',
+                                                                                            'error_subcode' => 2_018_218,
+                                                                                            'code' => 100
+                                                                                          }))
+      message_builder
+
+      contact = facebook_channel.inbox.contacts.first
+      # Refer: https://github.com/chatwoot/chatwoot/pull/3016 for this check
+      default_name = 'John Doe'
+
+      expect(facebook_channel.inbox.reload.contacts.count).to eq(1)
+      expect(contact.name).to eq(default_name)
+    end
   end
 end

From fbdc79df7657447c57cb9be3817118400675b558 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 9 Mar 2023 16:28:45 +0530
Subject: [PATCH 78/94] Fix: skip invalid access token from sentry (#6639)

---
 app/services/facebook/send_on_facebook_service.rb    | 12 ++++++++++--
 .../facebook/send_on_facebook_service_spec.rb        |  8 ++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index d85820b48..bf78edb16 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -9,9 +9,8 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
     send_message_to_facebook fb_text_message_params if message.content.present?
     send_message_to_facebook fb_attachment_message_params if message.attachments.present?
   rescue Facebook::Messenger::FacebookError => e
-    ChatwootExceptionTracker.new(e, account: message.account, user: message.sender).capture_exception
     # TODO : handle specific errors or else page will get disconnected
-    # channel.authorization_error!
+    handle_facebook_error(e)
   end
 
   def send_message_to_facebook(delivery_params)
@@ -67,4 +66,13 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
   def last_incoming_message
     conversation.messages.incoming.last
   end
+
+  def handle_facebook_error(exception)
+    # Refer: https://github.com/jgorset/facebook-messenger/blob/64fe1f5cef4c1e3fca295b205037f64dfebdbcab/lib/facebook/messenger/error.rb
+    if exception.to_s.include?('The session has been invalidated') || exception.to_s.include?('Error validating access token')
+      channel.authorization_error!
+    else
+      ChatwootExceptionTracker.new(exception, account: message.account, user: message.sender).capture_exception
+    end
+  end
 end
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index 674700c4d..dc938550b 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -52,6 +52,14 @@ describe Facebook::SendOnFacebookService do
         expect(bot).to have_received(:deliver)
       end
 
+      it 'raise and exception to validate access token' do
+        message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
+        allow(bot).to receive(:deliver).and_raise(Facebook::Messenger::FacebookError.new('message' => 'Error validating access token'))
+        ::Facebook::SendOnFacebookService.new(message: message).perform
+
+        expect(facebook_channel.authorization_error_count).to eq(1)
+      end
+
       it 'if message with attachment is sent from chatwoot and is outgoing' do
         message = build(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)

From f2684545d9401c2eebe456b947b1882ba4950c1c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 9 Mar 2023 20:11:08 +0530
Subject: [PATCH 79/94] fix: Handle dialogflow hook without setting and
 credentials (#6638)

---
 .../dialogflow/processor_service.rb           |  4 +++
 .../dialogflow/processor_service_spec.rb      | 33 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/lib/integrations/dialogflow/processor_service.rb b/lib/integrations/dialogflow/processor_service.rb
index 384c41c11..11fdc8f88 100644
--- a/lib/integrations/dialogflow/processor_service.rb
+++ b/lib/integrations/dialogflow/processor_service.rb
@@ -13,6 +13,10 @@ class Integrations::Dialogflow::ProcessorService < Integrations::BotProcessorSer
   end
 
   def get_response(session_id, message)
+    if hook.settings['credentials'].blank?
+      Rails.logger.warn "Account: #{hook.try(:account_id)} Hook: #{hook.id} credentials are not present." && return
+    end
+
     Google::Cloud::Dialogflow.configure { |config| config.credentials = hook.settings['credentials'] }
     session_client = Google::Cloud::Dialogflow.sessions
     session = session_client.session_path project: hook.settings['project_id'], session: session_id
diff --git a/spec/lib/integrations/dialogflow/processor_service_spec.rb b/spec/lib/integrations/dialogflow/processor_service_spec.rb
index 835dbc71b..e212caf57 100644
--- a/spec/lib/integrations/dialogflow/processor_service_spec.rb
+++ b/spec/lib/integrations/dialogflow/processor_service_spec.rb
@@ -44,6 +44,18 @@ describe Integrations::Dialogflow::ProcessorService do
       end
     end
 
+    context 'when dilogflow settings are not present' do
+      it 'will get empty response' do
+        last_count = conversation.reload.messages.count
+        allow(processor).to receive(:get_response).and_return({})
+        hook.settings = { 'project_id' => 'something_invalid', 'credentials' => {} }
+        hook.save!
+        processor.perform
+
+        expect(conversation.reload.messages.count).to eql(last_count)
+      end
+    end
+
     context 'when dialogflow returns fullfillment text to be empty' do
       let(:dialogflow_response) do
         ActiveSupport::HashWithIndifferentAccess.new(
@@ -126,4 +138,25 @@ describe Integrations::Dialogflow::ProcessorService do
       end
     end
   end
+
+  describe '#get_response' do
+    let(:google_dialogflow) { Google::Cloud::Dialogflow }
+    let(:session_client) { double }
+    let(:session) { double }
+    let(:query_input) { { text: { text: message, language_code: 'en-US' } } }
+    let(:processor) { described_class.new(event_name: event_name, hook: hook, event_data: event_data) }
+
+    before do
+      hook.update(settings: { 'project_id' => 'test', 'credentials' => 'creds' })
+      allow(google_dialogflow).to receive(:sessions).and_return(session_client)
+      allow(session_client).to receive(:session_path).and_return(session)
+      allow(session_client).to receive(:detect_intent).and_return({ session: session, query_input: query_input })
+    end
+
+    it 'returns indented response' do
+      response = processor.send(:get_response, conversation.contact_inbox.source_id, message.content)
+      expect(response[:query_input][:text][:text]).to eq(message)
+      expect(response[:query_input][:text][:language_code]).to eq('en-US')
+    end
+  end
 end

From c9b63ae8ebee2366159b3ae9738ffa0e46544009 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 10 Mar 2023 16:40:15 +0530
Subject: [PATCH 80/94] fix: hook exception for empty hook (#6646)

---
 lib/integrations/bot_processor_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/integrations/bot_processor_service.rb b/lib/integrations/bot_processor_service.rb
index b8a8c4895..600ee4305 100644
--- a/lib/integrations/bot_processor_service.rb
+++ b/lib/integrations/bot_processor_service.rb
@@ -1,4 +1,5 @@
 class Integrations::BotProcessorService
+  # TODO: In CSML processor service, the argument is agent bot, update initializers accordingly.
   pattr_initialize [:event_name!, :hook!, :event_data!]
 
   def perform
@@ -7,7 +8,7 @@ class Integrations::BotProcessorService
 
     process_content(message)
   rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: hook.account).capture_exception
+    ChatwootExceptionTracker.new(e, account: (hook&.account || agent_bot&.account)).capture_exception
   end
 
   private

From 2e95d3a173a5abccae86290d080a3abe934161f4 Mon Sep 17 00:00:00 2001
From: Jacson Santos <87338089+jacsonsantospht@users.noreply.github.com>
Date: Mon, 13 Mar 2023 04:50:53 -0300
Subject: [PATCH 81/94] fix: Duplicate conversations and contacts WA and Brazil
 numbers (#6222)

Resolves issue when receiving a message from Brazil  Whatsapp number.
Fixes: #5840


Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../whatsapp/incoming_message_base_service.rb |  4 +-
 .../incoming_message_service_helpers.rb       | 32 +++++++++
 .../whatsapp/incoming_message_service_spec.rb | 66 ++++++++++++++++++-
 3 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 83a82a3b1..193cfce69 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -84,8 +84,10 @@ class Whatsapp::IncomingMessageBaseService
     contact_params = @processed_params[:contacts]&.first
     return if contact_params.blank?
 
+    waid = processed_waid(contact_params[:wa_id])
+
     contact_inbox = ::ContactInboxWithContactBuilder.new(
-      source_id: contact_params[:wa_id],
+      source_id: waid,
       inbox: inbox,
       contact_attributes: { name: contact_params.dig(:profile, :name), phone_number: "+#{@processed_params[:messages].first[:from]}" }
     ).perform
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index cdf260b4a..099f9e88f 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -47,6 +47,38 @@ module Whatsapp::IncomingMessageServiceHelpers
     %w[reaction ephemeral unsupported].include?(message_type)
   end
 
+  def brazil_phone_number?(phone_number)
+    phone_number.match(/^55/)
+  end
+
+  # ref: https://github.com/chatwoot/chatwoot/issues/5840
+  def normalised_brazil_mobile_number(phone_number)
+    # DDD : Area codes in Brazil are popularly known as "DDD codes" (códigos DDD) or simply "DDD", from the initials of "direct distance dialing"
+    # https://en.wikipedia.org/wiki/Telephone_numbers_in_Brazil
+    ddd = phone_number[2, 2]
+    # Remove country code and DDD to obtain the number
+    number = phone_number[4, phone_number.length - 4]
+    normalised_number = "55#{ddd}#{number}"
+    # insert 9 to convert the number to the new mobile number format
+    normalised_number = "55#{ddd}9#{number}" if normalised_number.length != 13
+    normalised_number
+  end
+
+  def processed_waid(waid)
+    # in case of Brazil, we need to do additional processing
+    # https://github.com/chatwoot/chatwoot/issues/5840
+    if brazil_phone_number?(waid)
+      # check if there is an existing contact inbox with the normalised waid
+      # We will create conversation against it
+      contact_inbox = inbox.contact_inboxes.find_by(source_id: normalised_brazil_mobile_number(waid))
+
+      # if there is no contact inbox with the waid without 9,
+      # We will create contact inboxes and contacts with the number 9 added
+      waid = contact_inbox.source_id if contact_inbox.present?
+    end
+    waid
+  end
+
   def error_webhook_event?(message)
     message.key?('errors')
   end
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index 9c2ee9127..b2bd87d18 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -7,10 +7,11 @@ describe Whatsapp::IncomingMessageService do
     end
 
     let!(:whatsapp_channel) { create(:channel_whatsapp, sync_templates: false) }
+    let(:wa_id) { '2423423243' }
     let!(:params) do
       {
-        'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
-        'messages' => [{ 'from' => '2423423243', 'id' => 'SDFADSf23sfasdafasdfa', 'text' => { 'body' => 'Test' },
+        'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => wa_id }],
+        'messages' => [{ 'from' => wa_id, 'id' => 'SDFADSf23sfasdafasdfa', 'text' => { 'body' => 'Test' },
                          'timestamp' => '1633034394', 'type' => 'text' }]
       }.with_indifferent_access
     end
@@ -246,5 +247,66 @@ describe Whatsapp::IncomingMessageService do
         expect(contact_attachments.fallback_title).to eq('+1 (415) 341-8386')
       end
     end
+
+    # ref: https://github.com/chatwoot/chatwoot/issues/5840
+    describe 'When the incoming waid is a brazilian number in new format with 9 included' do
+      let(:wa_id) { '5541988887777' }
+
+      it 'creates appropriate conversations, message and contacts if contact does not exit' do
+        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('Test')
+        expect(whatsapp_channel.inbox.contact_inboxes.first.source_id).to eq(wa_id)
+      end
+
+      it 'appends to existing contact if contact inbox exists' do
+        contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: wa_id)
+        last_conversation = create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox)
+        described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
+        # no new conversation should be created
+        expect(whatsapp_channel.inbox.conversations.count).to eq(1)
+        # message appended to the last conversation
+        expect(last_conversation.messages.last.content).to eq(params[:messages].first[:text][:body])
+      end
+    end
+
+    describe 'When incoming waid is a brazilian number in old format without the 9 included' do
+      let(:wa_id) { '554188887777' }
+
+      context 'when a contact inbox exists in the old format without 9 included' do
+        it 'appends to existing contact' do
+          contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: wa_id)
+          last_conversation = create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox)
+          described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
+          # no new conversation should be created
+          expect(whatsapp_channel.inbox.conversations.count).to eq(1)
+          # message appended to the last conversation
+          expect(last_conversation.messages.last.content).to eq(params[:messages].first[:text][:body])
+        end
+      end
+
+      context 'when a contact inbox exists in the new format with 9 included' do
+        it 'appends to existing contact' do
+          contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: '5541988887777')
+          last_conversation = create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox)
+          described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
+          # no new conversation should be created
+          expect(whatsapp_channel.inbox.conversations.count).to eq(1)
+          # message appended to the last conversation
+          expect(last_conversation.messages.last.content).to eq(params[:messages].first[:text][:body])
+        end
+      end
+
+      context 'when a contact inbox does not exist in the new format with 9 included' do
+        it 'creates contact inbox with the incoming waid' do
+          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('Test')
+          expect(whatsapp_channel.inbox.contact_inboxes.first.source_id).to eq(wa_id)
+        end
+      end
+    end
   end
 end

From 8f4d4798c2f89149767790b6e8c16dc23b9ee485 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 13 Mar 2023 17:39:07 +0530
Subject: [PATCH 82/94] feat: Backend changes for article and categories
 ordering (#6655)

---
 .../api/v1/accounts/articles_controller.rb      |  6 +++---
 .../api/v1/portals/articles_controller.rb       |  1 +
 .../api/v1/portals/categories_controller.rb     |  2 +-
 app/models/article.rb                           |  1 +
 .../v1/accounts/articles/_article.json.jbuilder |  1 +
 .../public/api/v1/models/_article.json.jbuilder |  1 +
 .../api/v1/portals/_category-block.html.erb     |  4 ++--
 .../portals/categories/_category-block.html.erb |  4 ++--
 app/views/public/api/v1/portals/show.html.erb   |  2 +-
 .../20230313113920_add_position_to_articles.rb  |  5 +++++
 db/schema.rb                                    |  3 ++-
 .../api/v1/accounts/articles_controller_spec.rb |  8 ++++++--
 .../v1/accounts/categories_controller_spec.rb   | 17 +++++++++++------
 13 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 db/migrate/20230313113920_add_position_to_articles.rb

diff --git a/app/controllers/api/v1/accounts/articles_controller.rb b/app/controllers/api/v1/accounts/articles_controller.rb
index b6e07be5f..f1689d918 100644
--- a/app/controllers/api/v1/accounts/articles_controller.rb
+++ b/app/controllers/api/v1/accounts/articles_controller.rb
@@ -55,9 +55,9 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
 
   def article_params
     params.require(:article).permit(
-      :title, :slug, :content, :description, :position, :category_id, :author_id, :associated_article_id, :status, meta: [:title,
-                                                                                                                          :description,
-                                                                                                                          { tags: [] }]
+      :title, :slug, :position, :content, :description, :position, :category_id, :author_id, :associated_article_id, :status, meta: [:title,
+                                                                                                                                     :description,
+                                                                                                                                     { tags: [] }]
     )
   end
 
diff --git a/app/controllers/public/api/v1/portals/articles_controller.rb b/app/controllers/public/api/v1/portals/articles_controller.rb
index 5fccc9ad1..af5410fc3 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -8,6 +8,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
   def index
     @articles = @portal.articles
     @articles = @articles.search(list_params) if list_params.present?
+    @articles.order(position: :asc)
   end
 
   def show; end
diff --git a/app/controllers/public/api/v1/portals/categories_controller.rb b/app/controllers/public/api/v1/portals/categories_controller.rb
index b1096fbeb..7326f383b 100644
--- a/app/controllers/public/api/v1/portals/categories_controller.rb
+++ b/app/controllers/public/api/v1/portals/categories_controller.rb
@@ -5,7 +5,7 @@ class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals:
   layout 'portal'
 
   def index
-    @categories = @portal.categories
+    @categories = @portal.categories.order(position: :asc)
   end
 
   def show; end
diff --git a/app/models/article.rb b/app/models/article.rb
index 842bf2a6f..faed38e29 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -6,6 +6,7 @@
 #  content               :text
 #  description           :text
 #  meta                  :jsonb
+#  position              :integer
 #  slug                  :string           not null
 #  status                :integer
 #  title                 :string
diff --git a/app/views/api/v1/accounts/articles/_article.json.jbuilder b/app/views/api/v1/accounts/articles/_article.json.jbuilder
index 19b759161..996b58590 100644
--- a/app/views/api/v1/accounts/articles/_article.json.jbuilder
+++ b/app/views/api/v1/accounts/articles/_article.json.jbuilder
@@ -3,6 +3,7 @@ json.title article.title
 json.content article.content
 json.description article.description
 json.status article.status
+json.position article.position
 json.account_id article.account_id
 json.updated_at article.updated_at.to_i
 json.meta article.meta
diff --git a/app/views/public/api/v1/models/_article.json.jbuilder b/app/views/public/api/v1/models/_article.json.jbuilder
index cacf48dff..0fcdf2ed3 100644
--- a/app/views/public/api/v1/models/_article.json.jbuilder
+++ b/app/views/public/api/v1/models/_article.json.jbuilder
@@ -4,6 +4,7 @@ json.title article.title
 json.content article.content
 json.description article.description
 json.status article.status
+json.position article.position
 json.account_id article.account_id
 json.last_updated_at article.updated_at
 
diff --git a/app/views/public/api/v1/portals/_category-block.html.erb b/app/views/public/api/v1/portals/_category-block.html.erb
index a3424d432..c309b85e4 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -6,7 +6,7 @@
       </a>
     </h3>
     <span class="text-slate-500">
-      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.size %>
+      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.order(position: :asc).size %>
     </span>
   </div>
   <div class="py-4 w-full mt-2 flex-grow">
@@ -15,7 +15,7 @@
       <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
     </div>
     <% else %>
-      <% category.articles.published.take(5).each do |article| %>
+      <% category.articles.published.order(position: :asc).take(5).each do |article| %>
       <a
         class="text-slate-800 hover:underline leading-8"
         href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>/<%= article.id %>"
diff --git a/app/views/public/api/v1/portals/categories/_category-block.html.erb b/app/views/public/api/v1/portals/categories/_category-block.html.erb
index d99da3503..16db2c13c 100644
--- a/app/views/public/api/v1/portals/categories/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/categories/_category-block.html.erb
@@ -7,7 +7,7 @@
     </a>
     </h3>
     <span class="text-slate-500">
-      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.size %>
+      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.order(position: :asc).size %>
     </span>
   </div>
   <div class="py-4 w-full mt-2 flex-grow">
@@ -16,7 +16,7 @@
         <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
       </div>
     <% else %>
-      <% category.articles.published.take(5).each do |article| %>
+      <% category.articles.published.order(position: :asc).take(5).each do |article| %>
         <div class="flex justify-between content-center h-8 my-1">
           <a
             class="text-slate-800 hover:underline leading-8"
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index b56f20471..fe3cf5d9d 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -1,7 +1,7 @@
 <%= render "public/api/v1/portals/hero", portal: @portal %>
 <div class="max-w-5xl w-full flex-grow mx-auto py-8 px-4">
   <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-32 gap-y-0 lg:gap-y-12">
-    <% @portal.categories.where(locale: @locale).joins(:articles).where(articles:{ status: :published }).group('categories.id').each do |category| %>
+    <% @portal.categories.where(locale: @locale).joins(:articles).where(articles:{ status: :published }).order(position: :asc).group('categories.id').each do |category| %>
       <%= render "public/api/v1/portals/category-block", category: category, portal: @portal %>
     <% end %>
   </div>
diff --git a/db/migrate/20230313113920_add_position_to_articles.rb b/db/migrate/20230313113920_add_position_to_articles.rb
new file mode 100644
index 000000000..d7e195923
--- /dev/null
+++ b/db/migrate/20230313113920_add_position_to_articles.rb
@@ -0,0 +1,5 @@
+class AddPositionToArticles < ActiveRecord::Migration[6.1]
+  def change
+    add_column :articles, :position, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 991f5afb4..eb13c753d 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: 2023_03_06_100327) do
+ActiveRecord::Schema.define(version: 2023_03_13_113920) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -133,6 +133,7 @@ ActiveRecord::Schema.define(version: 2023_03_06_100327) do
     t.bigint "associated_article_id"
     t.jsonb "meta", default: {}
     t.string "slug", null: false
+    t.integer "position"
     t.index ["associated_article_id"], name: "index_articles_on_associated_article_id"
     t.index ["author_id"], name: "index_articles_on_author_id"
     t.index ["slug"], name: "index_articles_on_slug", unique: true
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
index 747a0c88d..6e4a7733a 100644
--- a/spec/controllers/api/v1/accounts/articles_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -27,7 +27,8 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
             slug: 'my-title',
             content: 'This is my content.',
             status: :published,
-            author_id: agent.id
+            author_id: agent.id,
+            position: 3
           }
         }
         post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
@@ -37,6 +38,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         json_response = JSON.parse(response.body)
         expect(json_response['payload']['title']).to eql('MyTitle')
         expect(json_response['payload']['status']).to eql('draft')
+        expect(json_response['payload']['position']).to be(3)
       end
 
       it 'associate to the root article' do
@@ -110,7 +112,8 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
           article: {
             title: 'MyTitle2',
             status: 'published',
-            description: 'test_description'
+            description: 'test_description',
+            position: 5
           }
         }
 
@@ -123,6 +126,7 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         json_response = JSON.parse(response.body)
         expect(json_response['payload']['title']).to eql(article_params[:article][:title])
         expect(json_response['payload']['status']).to eql(article_params[:article][:status])
+        expect(json_response['payload']['position']).to eql(article_params[:article][:position])
       end
     end
   end
diff --git a/spec/controllers/api/v1/accounts/categories_controller_spec.rb b/spec/controllers/api/v1/accounts/categories_controller_spec.rb
index 03898a3a7..783e89d93 100644
--- a/spec/controllers/api/v1/accounts/categories_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/categories_controller_spec.rb
@@ -4,12 +4,16 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
   let(:account) { create(:account) }
   let(:agent) { create(:user, account: account, role: :agent) }
   let!(:portal) { create(:portal, name: 'test_portal', account_id: account.id, config: { allowed_locales: %w[en es] }) }
-  let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id, slug: 'category_slug') }
+  let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id, slug: 'category_slug', position: 1) }
   let!(:category_to_associate) do
-    create(:category, name: 'associated category', portal: portal, account_id: account.id, slug: 'associated_category_slug')
+    create(:category, name: 'associated category', portal: portal, account_id: account.id, slug: 'associated_category_slug', position: 2)
+  end
+  let!(:related_category_1) do
+    create(:category, name: 'related category 1', portal: portal, account_id: account.id, slug: 'category_slug_1', position: 3)
+  end
+  let!(:related_category_2) do
+    create(:category, name: 'related category 2', portal: portal, account_id: account.id, slug: 'category_slug_2', position: 4)
   end
-  let!(:related_category_1) { create(:category, name: 'related category 1', portal: portal, account_id: account.id, slug: 'category_slug_1') }
-  let!(:related_category_2) { create(:category, name: 'related category 2', portal: portal, account_id: account.id, slug: 'category_slug_2') }
 
   before { create(:portal_member, user: agent, portal: portal) }
 
@@ -27,7 +31,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
           category: {
             name: 'test_category',
             description: 'test_description',
-            position: 1,
+            position: 5,
             locale: 'es',
             slug: 'test_category_1',
             parent_category_id: category.id,
@@ -42,7 +46,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
           category: {
             name: 'test_category_2',
             description: 'test_description_2',
-            position: 1,
+            position: 6,
             locale: 'es',
             slug: 'test_category_2',
             parent_category_id: category.id,
@@ -187,6 +191,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
         expect(json_response['payload']['related_categories'][0]['id']).to eql(related_category_1.id)
         expect(category.reload.related_category_ids).to eq([related_category_1.id])
         expect(related_category_1.reload.related_category_ids).to be_empty
+        expect(json_response['payload']['position']).to eql(category.position)
       end
 
       # [category_1, category_2] !== [category_2, category_1]

From 7cbf1857e46aa78e11d47bb4e5675a8c77b1fd72 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 13 Mar 2023 18:34:18 +0530
Subject: [PATCH 83/94] chore: Set statement timeout for Postgres (#6641)

By default, Rails does not set a timeout on database statements. For example, this will run for a full day, even if your ruby process goes away. But it's configurable in the database.yml with the statement_timeout variable.

Hence we are enforcing a 14s timeout by default. Migration commands inside chatwoot will run with a 10 minutes timeout. For specific cases like migrations, we can override this timeout using the environment variable POSTGRES_STATEMENT_TIMEOUT while starting a new rails console.

Test the timeouts from the rails console using.

```
ActiveRecord::Base.connection.execute("SELECT pg_sleep(15);")
```

ref: https://github.com/ankane/the-ultimate-guide-to-ruby-timeouts#postgresql
ref: https://til.hashrocket.com/posts/b44baf657d-railspg-statement-timeout-
---
 .devcontainer/devcontainer.json | 2 +-
 .env.example                    | 2 ++
 Procfile                        | 2 +-
 bin/update                      | 2 +-
 config/database.yml             | 5 ++++-
 deployment/setup_20.04.sh       | 6 +++---
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a70ba3788..d2dac356b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -25,7 +25,7 @@
   // 1025,8025 mailhog
   "forwardPorts": [8025, 3000, 3035],
 
-  "postCreateCommand": ".devcontainer/scripts/setup.sh && bundle exec rake db:chatwoot_prepare && yarn",
+  "postCreateCommand": ".devcontainer/scripts/setup.sh && POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rake db:chatwoot_prepare && yarn",
   "portsAttributes": {
     "3000": {
       "label": "Rails Server"
diff --git a/.env.example b/.env.example
index 39d5c06ec..4eee95bcb 100644
--- a/.env.example
+++ b/.env.example
@@ -52,6 +52,8 @@ POSTGRES_HOST=postgres
 POSTGRES_USERNAME=postgres
 POSTGRES_PASSWORD=
 RAILS_ENV=development
+# Changes the Postgres query timeout limit. The default is 14 seconds. Modify only when required.
+# POSTGRES_STATEMENT_TIMEOUT=14s
 RAILS_MAX_THREADS=5
 
 # The email from which all outgoing emails are sent
diff --git a/Procfile b/Procfile
index 01bfd1c1f..7eff0580d 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
-release: bundle exec rails db:chatwoot_prepare
+release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare
 web: bin/rails server -p $PORT -e $RAILS_ENV
 worker: bundle exec sidekiq -C config/sidekiq.yml
diff --git a/bin/update b/bin/update
index 58bfaed51..2f63af40f 100755
--- a/bin/update
+++ b/bin/update
@@ -21,7 +21,7 @@ chdir APP_ROOT do
   # system('bin/yarn')
 
   puts "\n== Updating database =="
-  system! 'bin/rails db:migrate'
+  system! 'POSTGRES_STATEMENT_TIMEOUT=600s bin/rails db:migrate'
 
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'
diff --git a/config/database.yml b/config/database.yml
index d7ee67e56..1001eedd7 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -5,7 +5,10 @@ default: &default
   port: <%= ENV.fetch('POSTGRES_PORT', '5432') %>
    # ref: https://github.com/mperham/sidekiq/issues/2985#issuecomment-531097962
   pool: <%= Sidekiq.server? ? Sidekiq.options[:concurrency] : ENV.fetch('RAILS_MAX_THREADS', 5) %>
-
+  variables:
+    # we are setting this value to be close to the racktimeout value. we will iterate and reduce this value going forward
+    statement_timeout: <%= ENV["POSTGRES_STATEMENT_TIMEOUT"] || "14s" %>
+    
 development:
   <<: *default
   database: <%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_dev') %>
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 82f4aca40..d10a6e789 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -362,7 +362,7 @@ EOF
 function run_db_migrations(){
   sudo -i -u chatwoot << EOF
   cd chatwoot
-  RAILS_ENV=production bundle exec rails db:chatwoot_prepare
+  RAILS_ENV=production POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare
 EOF
 }
 
@@ -574,7 +574,7 @@ The database migrations had not run as Postgres and Redis were not installed
 as part of the installation process. After modifying the environment
 variables (in the .env file) with your external database credentials, run
 the database migrations using the below command.
-'RAILS_ENV=production bundle exec rails db:chatwoot_prepare'.
+'RAILS_ENV=production POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare'.
 ***************************************************************************
 
 EOF
@@ -744,7 +744,7 @@ function upgrade() {
   rake assets:precompile RAILS_ENV=production
 
   # Migrate the database schema
-  RAILS_ENV=production bundle exec rake db:migrate
+  RAILS_ENV=production POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rake db:migrate
 
 EOF
 

From da76537011cde5020ed558f43fdba18ec90f1137 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 13 Mar 2023 19:10:31 +0530
Subject: [PATCH 84/94] chore: Search optimisations (#6644)

- Strip search term before searching
- order messages by created_at desc
- order contacts by last_activity_at desc
- order conversations by created_at desc
- Search only resolved contacts
- Optimize resolved contacts query

ref: #6583
---
 app/models/contact.rb                         |  4 +--
 app/models/installation_config.rb             |  2 ++
 app/models/message.rb                         |  4 +++
 app/models/notification.rb                    |  2 ++
 app/services/search_service.rb                | 17 +++++++---
 .../api/v1/accounts/search_controller_spec.rb |  2 +-
 spec/services/search_service_spec.rb          | 34 +++++++++++--------
 7 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 83019b969..9a742c0b2 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -136,9 +136,7 @@ class Contact < ApplicationRecord
   end
 
   def self.resolved_contacts
-    where.not(email: [nil, '']).or(
-      Current.account.contacts.where.not(phone_number: [nil, ''])
-    ).or(Current.account.contacts.where.not(identifier: [nil, '']))
+    where("COALESCE(NULLIF(contacts.email,''),NULLIF(contacts.phone_number,''),NULLIF(contacts.identifier,'')) IS NOT NULL")
   end
 
   def discard_invalid_attrs
diff --git a/app/models/installation_config.rb b/app/models/installation_config.rb
index 03e0b246a..f0e2ca4f1 100644
--- a/app/models/installation_config.rb
+++ b/app/models/installation_config.rb
@@ -24,6 +24,8 @@ class InstallationConfig < ApplicationRecord
   before_validation :set_lock
   validates :name, presence: true
 
+  # TODO: Get rid of default scope
+  # https://stackoverflow.com/a/1834250/939299
   default_scope { order(created_at: :desc) }
   scope :editable, -> { where(locked: false) }
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 7596dedaf..f45f2d8f9 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -81,6 +81,10 @@ class Message < ApplicationRecord
   scope :chat, -> { where.not(message_type: :activity).where(private: false) }
   scope :non_activity_messages, -> { where.not(message_type: :activity).reorder('id desc') }
   scope :today, -> { where("date_trunc('day', created_at) = ?", Date.current) }
+
+  # TODO: Get rid of default scope
+  # https://stackoverflow.com/a/1834250/939299
+  # if you want to change order, use `reorder`
   default_scope { order(created_at: :asc) }
 
   belongs_to :account
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 681203710..eadb48032 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -42,6 +42,8 @@ class Notification < ApplicationRecord
 
   after_create_commit :process_notification_delivery, :dispatch_create_event
 
+  # TODO: Get rid of default scope
+  # https://stackoverflow.com/a/1834250/939299
   default_scope { order(id: :desc) }
 
   PRIMARY_ACTORS = ['Conversation'].freeze
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 77994c26f..add7938a0 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -20,24 +20,31 @@ class SearchService
     @accessable_inbox_ids ||= @current_user.assigned_inboxes.pluck(:id)
   end
 
+  def search_query
+    @search_query ||= params[:q].to_s.strip
+  end
+
   def filter_conversations
     @conversations = current_account.conversations.where(inbox_id: accessable_inbox_ids)
                                     .joins('INNER JOIN contacts ON conversations.contact_id = contacts.id')
                                     .where("cast(conversations.display_id as text) ILIKE :search OR contacts.name ILIKE :search OR contacts.email
-                            ILIKE :search OR contacts.phone_number ILIKE :search OR contacts.identifier ILIKE :search", search: "%#{params[:q]}%")
+                            ILIKE :search OR contacts.phone_number ILIKE :search OR contacts.identifier ILIKE :search", search: "%#{search_query}%")
+                                    .order('conversations.created_at DESC')
                                     .limit(10)
   end
 
   def filter_messages
     @messages = current_account.messages.where(inbox_id: accessable_inbox_ids)
-                               .where('messages.content ILIKE :search', search: "%#{params[:q]}%")
-                               .where('created_at >= ?', 3.months.ago).limit(10)
+                               .where('messages.content ILIKE :search', search: "%#{search_query}%")
+                               .where('created_at >= ?', 3.months.ago)
+                               .reorder('created_at DESC')
+                               .limit(10)
   end
 
   def filter_contacts
     @contacts = current_account.contacts.where(
       "name ILIKE :search OR email ILIKE :search OR phone_number
-      ILIKE :search OR identifier ILIKE :search", search: "%#{params[:q]}%"
-    ).limit(10)
+      ILIKE :search OR identifier ILIKE :search", search: "%#{search_query}%"
+    ).resolved_contacts.order_on_last_activity_at('desc').limit(10)
   end
 end
diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb
index d12898d9e..9081c0d4c 100644
--- a/spec/controllers/api/v1/accounts/search_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/search_controller_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe 'Search', type: :request do
         expect(response).to have_http_status(:success)
         response_data = JSON.parse(response.body, symbolize_names: true)
 
-        expect(response_data[:payload][:messages].first[:content]).to eq 'test1'
+        expect(response_data[:payload][:messages].first[:content]).to eq 'test2'
         expect(response_data[:payload].keys).to match_array [:contacts, :conversations, :messages]
         expect(response_data[:payload][:messages].length).to eq 2
         expect(response_data[:payload][:conversations].length).to eq 1
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 9bea59568..3bc45e9ae 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -7,12 +7,12 @@ describe ::SearchService do
   let!(:account) { create(:account) }
   let!(:user) { create(:user, account: account) }
   let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
-  let(:harry) { create(:contact, name: 'Harry Potter', account_id: account.id) }
+  let!(:harry) { create(:contact, name: 'Harry Potter', email: 'test@test.com', account_id: account.id) }
+  let!(:conversation) { create(:conversation, contact: harry, inbox: inbox, account: account) }
+  let!(:message) { create(:message, account: account, inbox: inbox, content: 'Harry Potter is a wizard') }
 
   before do
     create(:inbox_member, user: user, inbox: inbox)
-    create(:conversation, contact: harry, inbox: inbox, account: account)
-    create(:message, account: account, inbox: inbox, content: 'Harry Potter is a wizard')
     Current.account = account
   end
 
@@ -50,38 +50,44 @@ describe ::SearchService do
     end
 
     context 'when contact search' do
-      it 'searches across name, email, phone_number and identifier' do
+      it 'searches across name, email, phone_number and identifier and returns in the order of contact last_activity_at' do
         # random contact
         create(:contact, account_id: account.id)
-        harry2 = create(:contact, email: 'HarryPotter@test.com', account_id: account.id)
-        harry3 = create(:contact, identifier: 'Potter123', account_id: account.id)
+        # unresolved contact -> no identifying info
+        # will not appear in search results
+        create(:contact, name: 'Harry Potter', account_id: account.id)
+        harry2 = create(:contact, email: 'HarryPotter@test.com', account_id: account.id, last_activity_at: 2.days.ago)
+        harry3 = create(:contact, identifier: 'Potter123', account_id: account.id, last_activity_at: 1.day.ago)
+        harry4 = create(:contact, identifier: 'Potter1235', account_id: account.id, last_activity_at: 2.minutes.ago)
 
-        params = { q: 'Potter' }
+        params = { q: 'Potter ' }
         search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Contact')
-        expect(search.perform[:contacts].map(&:id)).to match_array([harry.id, harry2.id, harry3.id])
+        expect(search.perform[:contacts].map(&:id)).to eq([harry4.id, harry3.id, harry2.id, harry.id])
       end
     end
 
     context 'when message search' do
-      it 'searches across message content' do
-        # random messages in another inbox
-        create(:message, account: account, inbox: create(:inbox, account: account), content: 'Harry Potter is a wizard')
+      it 'searches across message content and return in created_at desc' do
+        # random messages in another account
         create(:message, content: 'Harry Potter is a wizard')
+        # random messsage in inbox with out access
+        create(:message, account: account, inbox: create(:inbox, account: account), content: 'Harry Potter is a wizard')
         message2 = create(:message, account: account, inbox: inbox, content: 'harry is cool')
         params = { q: 'Harry' }
         search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
-        expect(search.perform[:messages].map(&:id)).to match_array([Message.first.id, message2.id])
+        expect(search.perform[:messages].map(&:id)).to eq([message2.id, message.id])
       end
     end
 
     context 'when conversation search' do
-      it 'searches across conversations using contact information' do
+      it 'searches across conversations using contact information and order by created_at desc' do
         # random messages in another inbox
         random = create(:contact, account_id: account.id)
         create(:conversation, contact: random, inbox: inbox, account: account)
+        conv2 = create(:conversation, contact: harry, inbox: inbox, account: account)
         params = { q: 'Harry' }
         search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Conversation')
-        expect(search.perform[:conversations].map(&:id)).to match_array([Conversation.first.id])
+        expect(search.perform[:conversations].map(&:id)).to eq([conv2.id, conversation.id])
       end
 
       it 'searches across conversations with display id' do

From cae3ac94cd12500af6f8557859e16425842a4d31 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 14 Mar 2023 13:09:43 +0530
Subject: [PATCH 85/94] feat: Search improvements for conversations  (#6645)

* feat: Shows search as a popover

* Reverts search from popover to page

* Fixes review comments on usability

* Fixes keyboard navigation issues
---
 .../dashboard/i18n/locale/en/search.json      |   3 +-
 .../search/components/SearchHeader.vue        |  73 +++++----
 .../modules/search/components/SearchInput.vue |  51 ++++++
 .../components/SearchResultContactItem.vue    |   2 +-
 .../SearchResultConversationItem.vue          |   2 +-
 .../search/components/SearchResultSection.vue |  13 +-
 .../modules/search/components/SearchTabs.vue  |   4 +-
 .../modules/search/components/SearchView.vue  | 148 +++++++++++-------
 .../conversation/search/PopOverSearch.vue     |   2 +-
 .../store/modules/conversationSearch.js       |   3 +
 10 files changed, 203 insertions(+), 98 deletions(-)
 create mode 100644 app/javascript/dashboard/modules/search/components/SearchInput.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/search.json b/app/javascript/dashboard/i18n/locale/en/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/en/search.json
+++ b/app/javascript/dashboard/i18n/locale/en/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
index ae0d786d9..aa85eddab 100644
--- a/app/javascript/dashboard/modules/search/components/SearchHeader.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="input-container">
+  <div class="input-container" :class="{ 'is-focused': isInputFocused }">
     <div class="icon-container">
       <fluent-icon icon="search" class="icon" aria-hidden="true" />
     </div>
@@ -8,11 +8,15 @@
       type="search"
       :placeholder="$t('SEARCH.INPUT_PLACEHOLDER')"
       :value="searchQuery"
+      @focus="onFocus"
+      @blur="onBlur"
       @input="debounceSearch"
     />
-    <div class="key-binding">
-      <span>{{ $t('SEARCH.PLACEHOLDER_KEYBINDING') }}</span>
-    </div>
+    <woot-label
+      :title="$t('SEARCH.PLACEHOLDER_KEYBINDING')"
+      :show-close="false"
+      small
+    />
   </div>
 </template>
 
@@ -21,6 +25,7 @@ export default {
   data() {
     return {
       searchQuery: '',
+      isInputFocused: false,
     };
   },
   mounted() {
@@ -35,6 +40,12 @@ export default {
       if (e.key === '/' && document.activeElement.tagName !== 'INPUT') {
         e.preventDefault();
         this.$refs.searchInput.focus();
+      } else if (
+        e.key === 'Escape' &&
+        document.activeElement.tagName === 'INPUT'
+      ) {
+        e.preventDefault();
+        this.$refs.searchInput.blur();
       }
     },
     debounceSearch(e) {
@@ -43,56 +54,50 @@ export default {
       this.debounce = setTimeout(async () => {
         if (this.searchQuery.length > 2 || this.searchQuery.match(/^[0-9]+$/)) {
           this.$emit('search', this.searchQuery);
+        } else {
+          this.$emit('search', '');
         }
       }, 500);
     },
+    onFocus() {
+      this.isInputFocused = true;
+    },
+    onBlur() {
+      this.isInputFocused = false;
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+@import 'app/javascript/dashboard/assets/scss/_mixins.scss';
 .input-container {
   position: relative;
-  border-radius: var(--border-radius-normal);
+  display: flex;
+  align-items: center;
+  padding: var(--space-small) var(--space-normal);
+  border-bottom: 1px solid var(--s-100);
+  transition: border-bottom 0.2s ease-in-out;
+
   input[type='search'] {
+    @include ghost-input;
     width: 100%;
-    padding-left: calc(var(--space-large) + var(--space-small));
-    margin-bottom: 0;
-    padding-right: var(--space-mega);
-    &:focus {
-      .icon {
-        color: var(--w-500) !important;
-      }
+    margin: 0;
+  }
+
+  &.is-focused {
+    border-bottom: 1px solid var(--w-100);
+
+    .icon {
+      color: var(--w-400);
     }
   }
 }
 .icon-container {
-  padding-left: var(--space-small);
   display: flex;
   align-items: center;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  position: absolute;
   .icon {
     color: var(--s-400);
   }
 }
-.key-binding {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  padding: var(--space-small) var(--space-small) 0 var(--space-small);
-  span {
-    color: var(--s-400);
-    font-weight: var(--font-weight-medium);
-    font-size: calc(var(--space-slab) + var(--space-micro));
-    padding: 0 var(--space-small);
-    border: 1px solid var(--s-100);
-    border-radius: var(--border-radius-normal);
-    display: inline-flex;
-    align-items: center;
-  }
-}
 </style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchInput.vue b/app/javascript/dashboard/modules/search/components/SearchInput.vue
new file mode 100644
index 000000000..6dca5239b
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchInput.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="search-input-box">
+    <woot-button
+      class="hollow"
+      size="small"
+      color-scheme="secondary"
+      is-expanded
+    >
+      <div class="search-input">
+        <fluent-icon icon="search" size="14px" class="search--icon" />
+        <span class="text-ellipsis search-placeholder">
+          {{ $t('CONVERSATION.SEARCH_MESSAGES') }}
+        </span>
+      </div>
+    </woot-button>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    tabs: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+.search-input-box {
+  padding: var(--space-small);
+}
+.search--icon {
+  flex-shrink: 0;
+  color: var(--s-500);
+}
+.search-placeholder {
+  color: var(--s-500);
+}
+
+.search-input {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: var(--space-smaller);
+}
+</style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
index c4c4d157f..c35651356 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
@@ -64,7 +64,7 @@ export default {
   }
 }
 .contact-details {
-  margin-left: var(--space-normal);
+  margin-left: var(--space-small);
 }
 .name {
   margin: 0;
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
index 2c47a4989..8341f69bd 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
@@ -113,7 +113,7 @@ export default {
   margin-left: var(--space-smaller);
 }
 .conversation-details {
-  margin-left: var(--space-normal);
+  margin-left: var(--space-small);
   flex-grow: 1;
   min-width: 0;
 }
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultSection.vue b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
index a3295c0d6..eab6f920c 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
@@ -1,6 +1,6 @@
 <template>
-  <section>
-    <div class="label-container">
+  <section class="result-section">
+    <div class="header">
       <h3 class="text-block-title">{{ title }}</h3>
     </div>
     <slot />
@@ -38,17 +38,21 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.result-section {
+  margin-bottom: var(--space-normal);
+}
 .search-list {
   list-style: none;
   margin: 0;
   padding: var(--spacing-normal) 0;
 }
-.label-container {
+.header {
   position: sticky;
   top: 0;
-  padding: var(--space-small) 0;
+  padding: var(--space-small);
   z-index: 50;
   background: var(--white);
+  margin-bottom: var(--space-micro);
 }
 
 .empty {
@@ -56,6 +60,7 @@ export default {
   align-items: center;
   justify-content: center;
   padding: var(--space-medium) var(--space-normal);
+  margin: 0 var(--space-small);
   background: var(--s-25);
   border-radius: var(--border-radius-medium);
   .icon {
diff --git a/app/javascript/dashboard/modules/search/components/SearchTabs.vue b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
index fa6944562..7d0d53063 100644
--- a/app/javascript/dashboard/modules/search/components/SearchTabs.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
@@ -34,7 +34,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .tab-container {
-  margin-left: var(--space-minus-normal);
-  margin-top: var(--space-small);
+  margin-top: var(--space-smaller);
+  border-bottom: 1px solid var(--s-50);
 }
 </style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
index 3d43cddc3..c079b46ae 100644
--- a/app/javascript/dashboard/modules/search/components/SearchView.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -1,46 +1,63 @@
 <template>
-  <section class="search-root">
-    <woot-button
-      color-scheme="secondary"
-      size="large"
-      icon="dismiss"
-      variant="smooth"
-      class="modal--close"
-      @click="onBack"
-    />
-    <header>
-      <search-header @search="search" />
-      <search-tabs :tabs="tabs" @tab-change="tab => (selectedTab = tab)" />
-    </header>
-    <div class="search-results">
-      <woot-loading-state v-if="uiFlags.isFetching" :message="'Searching'" />
-      <div v-else>
-        <div v-if="all.length">
-          <search-result-contacts-list
-            v-if="filterContacts"
-            :contacts="contacts"
-            :query="query"
-          />
-          <search-result-messages-list
-            v-if="filterMessages"
-            :messages="messages"
-            :query="query"
-          />
-          <search-result-conversations-list
-            v-if="filterConversations"
-            :conversations="conversations"
-            :query="query"
-          />
-        </div>
-        <div v-else-if="showEmptySearchResults" class="empty">
-          <fluent-icon icon="info" size="16px" class="icon" />
-          <p class="empty-state__text">
-            {{ $t('SEARCH.EMPTY_STATE_FULL', { query }) }}
-          </p>
+  <div class="width-100">
+    <div class="page-header">
+      <woot-button
+        icon="chevron-left"
+        variant="smooth"
+        size="small "
+        class="back-button"
+        @click="onBack"
+      >
+        {{ $t('GENERAL_SETTINGS.BACK') }}
+      </woot-button>
+    </div>
+    <section class="search-root">
+      <header>
+        <search-header @search="onSearch" />
+        <search-tabs
+          v-if="query"
+          :tabs="tabs"
+          @tab-change="tab => (selectedTab = tab)"
+        />
+      </header>
+      <div class="search-results">
+        <woot-loading-state v-if="uiFlags.isFetching" :message="'Searching'" />
+        <div v-else>
+          <div v-if="all.length">
+            <search-result-contacts-list
+              v-if="filterContacts"
+              :contacts="contacts"
+              :query="query"
+            />
+            <search-result-messages-list
+              v-if="filterMessages"
+              :messages="messages"
+              :query="query"
+            />
+            <search-result-conversations-list
+              v-if="filterConversations"
+              :conversations="conversations"
+              :query="query"
+            />
+          </div>
+          <div v-else-if="showEmptySearchResults && !all.length" class="empty">
+            <fluent-icon icon="info" size="16px" class="icon" />
+            <p class="empty-state__text">
+              {{ $t('SEARCH.EMPTY_STATE_FULL', { query }) }}
+            </p>
+          </div>
+          <div v-else class="empty text-center">
+            <p class="text-center">
+              <fluent-icon icon="search" size="24px" class="icon" />
+            </p>
+            <p class="empty-state__text">
+              {{ $t('SEARCH.EMPTY_STATE_DEFAULT') }}
+            </p>
+          </div>
         </div>
       </div>
-    </div>
-  </section>
+    </section>
+  </div>
 </template>
 
 <script>
@@ -51,6 +68,7 @@ import SearchResultMessagesList from './SearchResultMessagesList.vue';
 import SearchResultContactsList from './SearchResultContactsList.vue';
 import { isEmptyObject } from 'dashboard/helper/commons.js';
 
+import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
 import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 export default {
@@ -61,12 +79,14 @@ export default {
     SearchResultConversationsList,
     SearchResultMessagesList,
   },
+  mixins: [clickaway],
   data() {
     return {
       selectedTab: 'all',
       query: '',
     };
   },
+
   computed: {
     ...mapGetters({
       fullSearchRecords: 'conversationSearch/getFullSearchRecords',
@@ -147,48 +167,68 @@ export default {
       );
     },
   },
+  beforeDestroy() {
+    this.query = '';
+    this.$store.dispatch('conversationSearch/clearSearchResults');
+  },
+  mounted() {
+    this.$store.dispatch('conversationSearch/clearSearchResults');
+  },
   methods: {
-    search(q) {
+    onSearch(q) {
       this.query = q;
+      if (!q) {
+        this.$store.dispatch('conversationSearch/clearSearchResults');
+        return;
+      }
       this.$track(CONVERSATION_EVENTS.SEARCH_CONVERSATION);
       this.$store.dispatch('conversationSearch/fullSearch', { q });
     },
     onBack() {
-      this.$router.push({ name: 'home' });
+      if (window.history.length > 2) {
+        this.$router.go(-1);
+      } else {
+        this.$router.push({ name: 'home' });
+      }
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+.page-header {
+  display: flex;
+  padding: var(--space-normal);
+}
 .search-root {
-  max-width: 800px;
-  width: 100%;
   margin: 0 auto;
-  height: 100%;
+  max-width: 64rem;
+  min-height: 48rem;
+  width: 100%;
+  height: fit-content;
+  box-shadow: var(--shadow);
   display: flex;
   position: relative;
-  padding: var(--space-normal);
   flex-direction: column;
+  background: white;
+  border-radius: var(--border-radius-large);
+  margin-top: var(--space-large);
+  border-top: 1px solid var(--s-25);
   .search-results {
     flex-grow: 1;
     height: 100%;
+    max-height: 80vh;
     overflow-y: auto;
-    margin-top: var(--space-normal);
+    padding: 0 var(--space-small);
   }
 }
-.modal--close {
-  position: fixed;
-  right: var(--space-small);
-  top: var(--space-small);
-}
 
 .empty {
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
   padding: var(--space-medium) var(--space-normal);
-  background: var(--s-25);
   border-radius: var(--border-radius-medium);
   .icon {
     color: var(--s-500);
@@ -196,7 +236,7 @@ export default {
   .empty-state__text {
     text-align: center;
     color: var(--s-500);
-    margin: 0 var(--space-small);
+    margin: var(--space-small);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
index 1c5072dd4..9fae6d425 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -2,7 +2,7 @@
   <div class="search-wrap">
     <div class="search" :class="{ 'is-active': showSearchBox }">
       <woot-sidemenu-icon />
-      <router-link :to="searchUrl" class="search--link" replace>
+      <router-link :to="searchUrl" class="search--link">
         <div class="icon">
           <fluent-icon icon="search" class="search--icon" size="16" />
         </div>
diff --git a/app/javascript/dashboard/store/modules/conversationSearch.js b/app/javascript/dashboard/store/modules/conversationSearch.js
index 7c1e97d8c..15b15e474 100644
--- a/app/javascript/dashboard/store/modules/conversationSearch.js
+++ b/app/javascript/dashboard/store/modules/conversationSearch.js
@@ -55,6 +55,9 @@ export const actions = {
       commit(types.FULL_SEARCH_SET_UI_FLAG, { isFetching: false });
     }
   },
+  async clearSearchResults({ commit }) {
+    commit(types.FULL_SEARCH_SET, {});
+  },
 };
 
 export const mutations = {

From abe57873db6d519190ff3570fa3c8705f33e2656 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 14 Mar 2023 17:40:40 +0530
Subject: [PATCH 86/94] chore: Disable throwing Webhook exceptions to Sentry
 (#6663)

- There is little value in throwing the third-party webhook-related exceptions to sentry. Let's rather write it to logs instead.
---
 lib/webhooks/trigger.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/webhooks/trigger.rb b/lib/webhooks/trigger.rb
index 517f6862a..228d34b7f 100644
--- a/lib/webhooks/trigger.rb
+++ b/lib/webhooks/trigger.rb
@@ -7,10 +7,7 @@ class Webhooks::Trigger
       timeout: 5
     )
     Rails.logger.info "Performed Request:  Code - #{response.code}"
-  rescue *ExceptionList::REST_CLIENT_EXCEPTIONS, URI::InvalidURIError => e
-    Rails.logger.error "Exception: invalid webhook url #{url} : #{e.message}"
   rescue StandardError => e
-    Rails.logger.error "Exception: invalid webhook url #{url} : #{e.message}"
-    ChatwootExceptionTracker.new(e).capture_exception
+    Rails.logger.warn "Exception: invalid webhook url #{url} : #{e.message}"
   end
 end

From 24f8befdf22fbe49cc9aa55c74e69a5df95f57d3 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 14 Mar 2023 20:00:01 +0530
Subject: [PATCH 87/94] Fix: Add articles order in category show page (#6662)

---
 app/views/public/api/v1/portals/categories/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/public/api/v1/portals/categories/show.html.erb b/app/views/public/api/v1/portals/categories/show.html.erb
index ebee41d46..5ca709719 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -32,7 +32,7 @@
       <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
     </div>
     <% else %>
-    <% @category.articles.published.each do |article| %>
+    <% @category.articles.published.order(:position).each do |article| %>
       <a
         class="text-slate-800 flex justify-between content-center mb-4 py-2"
         href="/hc/<%= @portal.slug %>/<%= @category.locale %>/<%= @category.slug %>/<%= article.id %>"

From e8a174f6894959b8403ee9b0156bfacb2e3daaae Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 14 Mar 2023 20:50:28 +0530
Subject: [PATCH 88/94] chore: Add sidekiq metrics to newrelic (#6659)

* chore: Add sidekiq stats to newrelic

* chore: add gemlock
---
 Gemfile               | 1 +
 Gemfile.lock          | 4 ++++
 config/application.rb | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index a5abc1d90..99151978a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -101,6 +101,7 @@ gem 'google-cloud-dialogflow'
 gem 'ddtrace', require: false
 gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
+gem 'newrelic-sidekiq-metrics', require: false
 gem 'scout_apm', require: false
 gem 'sentry-rails', require: false
 gem 'sentry-ruby', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d917a500..4e1624be0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -451,6 +451,9 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     netrc (0.11.0)
+    newrelic-sidekiq-metrics (1.6.1)
+      newrelic_rpm (~> 8)
+      sidekiq
     newrelic_rpm (8.15.0)
     nio4r (2.5.8)
     nokogiri (1.13.10)
@@ -820,6 +823,7 @@ DEPENDENCIES
   net-imap
   net-pop
   net-smtp
+  newrelic-sidekiq-metrics
   newrelic_rpm
   omniauth
   omniauth-google-oauth2
diff --git a/config/application.rb b/config/application.rb
index 428747b2a..ed9d9a9b4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,8 +14,13 @@ Bundler.require(*Rails.groups)
 Dotenv::Railtie.load
 require 'ddtrace' if ENV.fetch('DD_TRACE_AGENT_URL', false).present?
 require 'elastic-apm' if ENV.fetch('ELASTIC_APM_SECRET_TOKEN', false).present?
-require 'newrelic_rpm' if ENV.fetch('NEW_RELIC_LICENSE_KEY', false).present?
 require 'scout_apm' if ENV.fetch('SCOUT_KEY', false).present?
+
+if ENV.fetch('NEW_RELIC_LICENSE_KEY', false).present?
+  require 'newrelic-sidekiq-metrics'
+  require 'newrelic_rpm'
+end
+
 if ENV.fetch('SENTRY_DSN', false).present?
   require 'sentry-ruby'
   require 'sentry-rails'

From eb7070d94623e78f8250d06d8f9f961a1caa3036 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 14 Mar 2023 09:09:57 -0700
Subject: [PATCH 89/94] feat(poc): Disable widget based on country (#6658)

---
 .env.example                                  |  6 +--
 Procfile                                      |  4 +-
 app/controllers/widgets_controller.rb         |  5 +++
 app/jobs/contact_ip_lookup_job.rb             | 40 +------------------
 app/services/ip_lookup_service.rb             | 15 +++++++
 config/initializers/geocoder.rb               |  8 +---
 .../enterprise/widgets_controller.rb          | 14 +++++++
 lib/tasks/ip_lookup.rake                      | 33 +++++++++++++++
 8 files changed, 72 insertions(+), 53 deletions(-)
 create mode 100644 app/services/ip_lookup_service.rb
 create mode 100644 enterprise/app/controllers/enterprise/widgets_controller.rb
 create mode 100644 lib/tasks/ip_lookup.rake

diff --git a/.env.example b/.env.example
index 4eee95bcb..ac4a2c0e8 100644
--- a/.env.example
+++ b/.env.example
@@ -191,11 +191,7 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#environment-variables
 # DD_TRACE_AGENT_URL=
 
-## IP look up configuration
-## ref https://github.com/alexreisner/geocoder/blob/master/README_API_GUIDE.md
-## works only on accounts with ip look up feature enabled
-# IP_LOOKUP_SERVICE=geoip2
-# maxmindb api key to use geoip2 service
+# MaxMindDB API key to download GeoLite2 City database
 # IP_LOOKUP_API_KEY=
 
 ## Rack Attack configuration
diff --git a/Procfile b/Procfile
index 7eff0580d..3cfa8ae13 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
 release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare
-web: bin/rails server -p $PORT -e $RAILS_ENV
-worker: bundle exec sidekiq -C config/sidekiq.yml
+web: bundle exec rails ip_lookup:setup && bin/rails server -p $PORT -e $RAILS_ENV
+worker: bundle exec rails ip_lookup:setup && bundle exec sidekiq -C config/sidekiq.yml
diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index ac26a36c5..a4e40eb9c 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -5,6 +5,7 @@ class WidgetsController < ActionController::Base
   before_action :set_global_config
   before_action :set_web_widget
   before_action :ensure_account_is_active
+  before_action :ensure_location_is_supported
   before_action :set_token
   before_action :set_contact
   before_action :build_contact
@@ -54,6 +55,8 @@ class WidgetsController < ActionController::Base
     render json: { error: 'Account is suspended' }, status: :unauthorized unless @web_widget.inbox.account.active?
   end
 
+  def ensure_location_is_supported; end
+
   def additional_attributes
     if @web_widget.inbox.account.feature_enabled?('ip_lookup')
       { created_at_ip: request.remote_ip }
@@ -70,3 +73,5 @@ class WidgetsController < ActionController::Base
     response.headers.delete('X-Frame-Options')
   end
 end
+
+WidgetsController.prepend_mod_with('WidgetsController')
diff --git a/app/jobs/contact_ip_lookup_job.rb b/app/jobs/contact_ip_lookup_job.rb
index cf46d4ea3..b637223b7 100644
--- a/app/jobs/contact_ip_lookup_job.rb
+++ b/app/jobs/contact_ip_lookup_job.rb
@@ -1,11 +1,7 @@
-require 'rubygems/package'
-
 class ContactIpLookupJob < ApplicationJob
   queue_as :default
 
   def perform(contact)
-    return unless ensure_look_up_service
-
     update_contact_location_from_ip(contact)
   rescue Errno::ETIMEDOUT => e
     Rails.logger.warn "Exception: ip resolution failed : #{e.message}"
@@ -13,18 +9,8 @@ class ContactIpLookupJob < ApplicationJob
 
   private
 
-  def ensure_look_up_service
-    return if ENV['IP_LOOKUP_SERVICE'].blank? || ENV['IP_LOOKUP_API_KEY'].blank?
-    return true if ENV['IP_LOOKUP_SERVICE'].to_sym != :geoip2
-
-    ensure_look_up_db
-  end
-
   def update_contact_location_from_ip(contact)
-    ip = get_contact_ip(contact)
-    return if ip.blank?
-
-    geocoder_result = Geocoder.search(ip).first
+    geocoder_result = IpLookupService.new.perform(get_contact_ip(contact))
     return unless geocoder_result
 
     contact.additional_attributes ||= {}
@@ -37,28 +23,4 @@ class ContactIpLookupJob < ApplicationJob
   def get_contact_ip(contact)
     contact.additional_attributes&.dig('updated_at_ip') || contact.additional_attributes&.dig('created_at_ip')
   end
-
-  def ensure_look_up_db
-    return true if File.exist?(GeocoderConfiguration::LOOK_UP_DB)
-
-    setup_vendor_db
-  end
-
-  def setup_vendor_db
-    base_url = 'https://download.maxmind.com/app/geoip_download'
-    source_file = Down.download(
-      "#{base_url}?edition_id=GeoLite2-City&suffix=tar.gz&license_key=#{ENV.fetch('IP_LOOKUP_API_KEY', nil)}"
-    )
-    tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(source_file))
-    tar_extract.rewind
-
-    tar_extract.each do |entry|
-      next unless entry.full_name.include?('GeoLite2-City.mmdb') && entry.file?
-
-      File.open GeocoderConfiguration::LOOK_UP_DB, 'wb' do |f|
-        f.print entry.read
-      end
-      return true
-    end
-  end
 end
diff --git a/app/services/ip_lookup_service.rb b/app/services/ip_lookup_service.rb
new file mode 100644
index 000000000..fae3efc00
--- /dev/null
+++ b/app/services/ip_lookup_service.rb
@@ -0,0 +1,15 @@
+class IpLookupService
+  def perform(ip_address)
+    return if ip_address.blank? || !ip_database_available?
+
+    Geocoder.search(ip_address).first
+  rescue Errno::ETIMEDOUT => e
+    Rails.logger.warn "Exception: IP resolution failed :#{e.message}"
+  end
+
+  private
+
+  def ip_database_available?
+    File.exist?(GeocoderConfiguration::LOOK_UP_DB)
+  end
+end
diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
index 0b4dced86..9c53a1635 100644
--- a/config/initializers/geocoder.rb
+++ b/config/initializers/geocoder.rb
@@ -23,10 +23,4 @@ module GeocoderConfiguration
   LOOK_UP_DB = Rails.root.join('vendor/db/GeoLiteCity.mmdb')
 end
 
-if ENV['IP_LOOKUP_SERVICE'].present?
-  if ENV['IP_LOOKUP_SERVICE'] == 'geoip2'
-    Geocoder.configure(ip_lookup: :geoip2, geoip2: { file: GeocoderConfiguration::LOOK_UP_DB })
-  else
-    Geocoder.configure(ip_lookup: ENV['IP_LOOKUP_SERVICE'].to_sym, api_key: ENV.fetch('IP_LOOKUP_API_KEY', nil))
-  end
-end
+Geocoder.configure(ip_lookup: :geoip2, geoip2: { file: GeocoderConfiguration::LOOK_UP_DB }) if ENV['IP_LOOKUP_API_KEY'].present?
diff --git a/enterprise/app/controllers/enterprise/widgets_controller.rb b/enterprise/app/controllers/enterprise/widgets_controller.rb
new file mode 100644
index 000000000..fecd2a00b
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/widgets_controller.rb
@@ -0,0 +1,14 @@
+module Enterprise::WidgetsController
+  private
+
+  def ensure_location_is_supported
+    countries = @web_widget.inbox.account.custom_attributes['allowed_countries']
+    return if countries.blank?
+
+    geocoder_result = IpLookupService.new.perform(request.remote_ip)
+    return unless geocoder_result
+
+    country_enabled = countries.include?(geocoder_result.country_code)
+    render json: { error: 'Location is not supported' }, status: :unauthorized unless country_enabled
+  end
+end
diff --git a/lib/tasks/ip_lookup.rake b/lib/tasks/ip_lookup.rake
new file mode 100644
index 000000000..f1ae80100
--- /dev/null
+++ b/lib/tasks/ip_lookup.rake
@@ -0,0 +1,33 @@
+require 'rubygems/package'
+
+namespace :ip_lookup do
+  task setup: :environment do
+    next if File.exist?(GeocoderConfiguration::LOOK_UP_DB)
+
+    ip_lookup_api_key = ENV.fetch('IP_LOOKUP_API_KEY')
+    next if ip_lookup_api_key.blank?
+
+    puts '[rake ip_lookup:setup] Fetch GeoLite2-City database'
+
+    begin
+      base_url = 'https://download.maxmind.com/app/geoip_download'
+      source_file = Down.download(
+        "#{base_url}?edition_id=GeoLite2-City&suffix=tar.gz&license_key=#{ip_lookup_api_key}"
+      )
+
+      tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(source_file))
+      tar_extract.rewind
+
+      tar_extract.each do |entry|
+        next unless entry.full_name.include?('GeoLite2-City.mmdb') && entry.file?
+
+        File.open GeocoderConfiguration::LOOK_UP_DB, 'wb' do |f|
+          f.print entry.read
+        end
+      end
+      puts '[rake ip_lookup:setup] Fetch complete'
+    rescue StandardError => e
+      puts "[rake ip_lookup:setup] #{e.message}"
+    end
+  end
+end

From a4bcb7f154a32ecaa2a9087b0281aca2ae65c0c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Mar 2023 19:00:09 -0700
Subject: [PATCH 90/94] chore(deps): bump @xmldom/xmldom from 0.7.5 to 0.7.9
 (#6666)

Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.7.5 to 0.7.9.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xmldom/xmldom/compare/0.7.5...0.7.9)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  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 98eada5a3..16daef1ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4520,9 +4520,9 @@
     "@xtuc/long" "4.2.2"
 
 "@xmldom/xmldom@^0.7.2":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d"
-  integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==
+  version "0.7.9"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.9.tgz#7f9278a50e737920e21b297b8a35286e9942c056"
+  integrity sha512-yceMpm/xd4W2a85iqZyO09gTnHvXF6pyiWjD2jcOJs7hRoZtNNOO1eJlhHj1ixA+xip2hOyGn+LgcvLCMo5zXA==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"

From a99c37ae5ef7a0088228bf6ef6df3d7a8d980e02 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 15 Mar 2023 14:05:54 +0530
Subject: [PATCH 91/94] chore: Resolve bundle audit (#6671)

- Update gems to resolve bundle Audit advisories
---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  | 149 +++++++++---------
 .../stylesheets/administrate/application.scss |   1 -
 spec/presenters/mail_presenter_spec.rb        |   2 +-
 4 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/Gemfile b/Gemfile
index 99151978a..7013245e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ ruby '3.1.3'
 
 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
-gem 'rails', '~> 6.1', '>= 6.1.7.1'
+gem 'rails', '~> 6.1', '>= 6.1.7.3'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e1624be0..9937dfcc2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,63 +9,63 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actioncable (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionmailbox (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      actionview (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionmailer (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      actionview (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.1)
-      actionview (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionpack (6.1.7.3)
+      actionview (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       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.7.1)
-      actionpack (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actiontext (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionview (6.1.7.3)
+      activesupport (= 6.1.7.3)
       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.7.1)
-      activesupport (= 6.1.7.1)
+    activejob (6.1.7.3)
+      activesupport (= 6.1.7.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.1)
-      activesupport (= 6.1.7.1)
-    activerecord (6.1.7.1)
-      activemodel (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    activemodel (6.1.7.3)
+      activesupport (= 6.1.7.3)
+    activerecord (6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
     activerecord-import (1.4.0)
       activerecord (>= 4.2)
-    activestorage (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    activestorage (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.1)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -138,7 +138,7 @@ GEM
     climate_control (1.1.1)
     coderay (1.1.3)
     commonmarker (0.23.7)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     connection_pool (2.2.5)
     crack (0.4.5)
       rexml
@@ -189,7 +189,7 @@ GEM
       concurrent-ruby (~> 1.0)
       http (>= 3.0)
     email_reply_trimmer (0.1.13)
-    erubi (1.10.0)
+    erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
     execjs (2.8.1)
@@ -250,7 +250,7 @@ GEM
       grpc (~> 1.36)
     geocoder (1.8.0)
     gli (2.21.0)
-    globalid (1.0.1)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     gmail_xoauth (0.4.2)
       oauth (>= 0.3.6)
@@ -355,7 +355,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
@@ -419,8 +419,11 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     maxminddb (0.1.22)
     memoist (0.16.2)
@@ -430,8 +433,8 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    mini_portile2 (2.8.1)
+    minitest (5.18.0)
     mock_redis (0.32.0)
       ruby2_keywords
     momentjs-rails (2.29.1.1)
@@ -456,14 +459,14 @@ GEM
       sidekiq
     newrelic_rpm (8.15.0)
     nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-arm64-darwin)
+    nokogiri (1.14.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-darwin)
+    nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.10)
     oauth2 (2.0.9)
@@ -511,8 +514,8 @@ GEM
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.6.1)
-    rack (2.2.6.3)
+    racc (1.6.2)
+    rack (2.2.6.4)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
@@ -521,32 +524,32 @@ GEM
       rack
     rack-proxy (0.7.2)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (6.1.7.1)
-      actioncable (= 6.1.7.1)
-      actionmailbox (= 6.1.7.1)
-      actionmailer (= 6.1.7.1)
-      actionpack (= 6.1.7.1)
-      actiontext (= 6.1.7.1)
-      actionview (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activemodel (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    rails (6.1.7.3)
+      actioncable (= 6.1.7.3)
+      actionmailbox (= 6.1.7.3)
+      actionmailer (= 6.1.7.3)
+      actionpack (= 6.1.7.3)
+      actiontext (= 6.1.7.3)
+      actionview (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.1)
+      railties (= 6.1.7.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
-    railties (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    railties (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -681,9 +684,9 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (4.1.1)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -706,7 +709,7 @@ GEM
       nokogiri (>= 1.6, < 2.0)
     twitty (0.1.4)
       oauth
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
@@ -751,7 +754,7 @@ GEM
     working_hours (1.4.1)
       activesupport (>= 3.2)
       tzinfo
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   arm64-darwin-20
@@ -838,7 +841,7 @@ DEPENDENCIES
   rack-attack
   rack-cors
   rack-timeout
-  rails (~> 6.1, >= 6.1.7.1)
+  rails (~> 6.1, >= 6.1.7.3)
   redis
   redis-namespace
   responders
diff --git a/app/assets/stylesheets/administrate/application.scss b/app/assets/stylesheets/administrate/application.scss
index 79738bbf3..86c5254ec 100644
--- a/app/assets/stylesheets/administrate/application.scss
+++ b/app/assets/stylesheets/administrate/application.scss
@@ -6,7 +6,6 @@
 @import 'utilities/text-color';
 
 @import 'selectize';
-@import 'datetime_picker';
 
 @import 'library/clearfix';
 @import 'library/data-label';
diff --git a/spec/presenters/mail_presenter_spec.rb b/spec/presenters/mail_presenter_spec.rb
index a783c92a3..2b4f42ac3 100644
--- a/spec/presenters/mail_presenter_spec.rb
+++ b/spec/presenters/mail_presenter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe MailPresenter do
 
     it 'give utf8 encoded content' do
       expect(decorated_mail.subject).to eq("Discussion: Let's debate these attachments")
-      expect(decorated_mail.text_content[:full]).to eq("Let's talk about these images:\r\n\r\n")
+      expect(decorated_mail.text_content[:full]).to eq("Let's talk about these images:\n\n")
     end
 
     it 'give decoded blob attachments' do

From 7331154f048adb6cd08f26dd6dded728aa53ccb6 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Wed, 15 Mar 2023 02:53:38 -0700
Subject: [PATCH 92/94] chore: Update translations

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../dashboard/i18n/locale/ar/search.json      |  3 +-
 .../dashboard/i18n/locale/bg/search.json      |  3 +-
 .../dashboard/i18n/locale/ca/search.json      |  3 +-
 .../dashboard/i18n/locale/cs/search.json      |  3 +-
 .../dashboard/i18n/locale/da/search.json      |  3 +-
 .../dashboard/i18n/locale/de/search.json      |  3 +-
 .../dashboard/i18n/locale/el/search.json      |  3 +-
 .../i18n/locale/es/attributesMgmt.json        |  2 +-
 .../dashboard/i18n/locale/es/contact.json     |  2 +-
 .../dashboard/i18n/locale/es/helpCenter.json  | 16 +++++-----
 .../dashboard/i18n/locale/es/inboxMgmt.json   | 24 +++++++--------
 .../i18n/locale/es/integrations.json          | 14 ++++-----
 .../dashboard/i18n/locale/es/report.json      | 22 +++++++-------
 .../dashboard/i18n/locale/es/search.json      | 13 ++++----
 .../dashboard/i18n/locale/es/settings.json    | 16 +++++-----
 .../dashboard/i18n/locale/es/signup.json      |  8 ++---
 .../dashboard/i18n/locale/fa/search.json      |  3 +-
 .../dashboard/i18n/locale/fi/search.json      |  3 +-
 .../dashboard/i18n/locale/fr/search.json      |  3 +-
 .../dashboard/i18n/locale/he/search.json      |  3 +-
 .../dashboard/i18n/locale/hi/search.json      |  3 +-
 .../dashboard/i18n/locale/hu/search.json      |  3 +-
 .../dashboard/i18n/locale/hy/search.json      |  3 +-
 .../dashboard/i18n/locale/id/search.json      |  3 +-
 .../dashboard/i18n/locale/is/search.json      |  3 +-
 .../dashboard/i18n/locale/it/search.json      |  3 +-
 .../dashboard/i18n/locale/ja/search.json      |  3 +-
 .../dashboard/i18n/locale/ka/search.json      |  3 +-
 .../dashboard/i18n/locale/ko/search.json      |  3 +-
 .../dashboard/i18n/locale/lt/search.json      |  3 +-
 .../dashboard/i18n/locale/lv/search.json      |  3 +-
 .../dashboard/i18n/locale/ml/search.json      |  3 +-
 .../dashboard/i18n/locale/ms/search.json      |  3 +-
 .../dashboard/i18n/locale/ne/search.json      |  3 +-
 .../dashboard/i18n/locale/nl/search.json      |  3 +-
 .../dashboard/i18n/locale/no/search.json      |  3 +-
 .../dashboard/i18n/locale/pl/search.json      |  3 +-
 .../dashboard/i18n/locale/pt/search.json      |  3 +-
 .../dashboard/i18n/locale/pt_BR/report.json   | 22 +++++++-------
 .../dashboard/i18n/locale/pt_BR/search.json   | 13 ++++----
 .../dashboard/i18n/locale/ro/search.json      |  3 +-
 .../dashboard/i18n/locale/ru/search.json      |  3 +-
 .../dashboard/i18n/locale/sk/search.json      |  3 +-
 .../dashboard/i18n/locale/sr/search.json      |  3 +-
 .../dashboard/i18n/locale/sv/search.json      |  3 +-
 .../dashboard/i18n/locale/ta/search.json      |  3 +-
 .../dashboard/i18n/locale/th/search.json      |  3 +-
 .../dashboard/i18n/locale/tr/search.json      |  3 +-
 .../dashboard/i18n/locale/uk/search.json      |  3 +-
 .../dashboard/i18n/locale/ur/search.json      |  3 +-
 .../dashboard/i18n/locale/ur_IN/search.json   |  3 +-
 .../dashboard/i18n/locale/vi/search.json      |  3 +-
 .../dashboard/i18n/locale/zh_CN/search.json   |  3 +-
 .../dashboard/i18n/locale/zh_TW/search.json   |  3 +-
 app/javascript/widget/i18n/locale/es.json     |  4 +--
 config/locales/ar.yml                         |  8 ++---
 config/locales/bg.yml                         |  8 ++---
 config/locales/ca.yml                         |  8 ++---
 config/locales/cs.yml                         |  8 ++---
 config/locales/da.yml                         |  8 ++---
 config/locales/de.yml                         |  8 ++---
 config/locales/el.yml                         |  8 ++---
 config/locales/es.yml                         | 30 +++++++++----------
 config/locales/fa.yml                         |  8 ++---
 config/locales/fi.yml                         |  8 ++---
 config/locales/fr.yml                         |  8 ++---
 config/locales/he.yml                         |  8 ++---
 config/locales/hi.yml                         |  8 ++---
 config/locales/hu.yml                         |  8 ++---
 config/locales/hy.yml                         |  8 ++---
 config/locales/id.yml                         |  8 ++---
 config/locales/is.yml                         |  8 ++---
 config/locales/it.yml                         |  8 ++---
 config/locales/ja.yml                         |  8 ++---
 config/locales/ka.yml                         |  8 ++---
 config/locales/ko.yml                         |  8 ++---
 config/locales/lt.yml                         |  8 ++---
 config/locales/lv.yml                         |  8 ++---
 config/locales/ml.yml                         |  8 ++---
 config/locales/ms.yml                         |  8 ++---
 config/locales/ne.yml                         |  8 ++---
 config/locales/nl.yml                         |  8 ++---
 config/locales/no.yml                         |  8 ++---
 config/locales/pl.yml                         |  8 ++---
 config/locales/pt.yml                         |  8 ++---
 config/locales/pt_BR.yml                      |  8 ++---
 config/locales/ro.yml                         |  8 ++---
 config/locales/ru.yml                         |  8 ++---
 config/locales/sk.yml                         |  8 ++---
 config/locales/sr.yml                         |  8 ++---
 config/locales/sv.yml                         |  8 ++---
 config/locales/ta.yml                         |  8 ++---
 config/locales/th.yml                         |  8 ++---
 config/locales/tr.yml                         |  8 ++---
 config/locales/uk.yml                         |  8 ++---
 config/locales/ur.yml                         |  8 ++---
 config/locales/ur_IN.yml                      |  8 ++---
 config/locales/vi.yml                         |  8 ++---
 config/locales/zh_CN.yml                      |  8 ++---
 config/locales/zh_TW.yml                      |  8 ++---
 100 files changed, 356 insertions(+), 311 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/search.json b/app/javascript/dashboard/i18n/locale/ar/search.json
index ddbe8a32f..ef665170a 100644
--- a/app/javascript/dashboard/i18n/locale/ar/search.json
+++ b/app/javascript/dashboard/i18n/locale/ar/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "رد آلي",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/bg/search.json b/app/javascript/dashboard/i18n/locale/bg/search.json
index 318130836..02d13552c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/search.json
+++ b/app/javascript/dashboard/i18n/locale/bg/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ca/search.json b/app/javascript/dashboard/i18n/locale/ca/search.json
index 7c16113e9..efd6f1503 100644
--- a/app/javascript/dashboard/i18n/locale/ca/search.json
+++ b/app/javascript/dashboard/i18n/locale/ca/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/cs/search.json b/app/javascript/dashboard/i18n/locale/cs/search.json
index e515bb140..ba3d90461 100644
--- a/app/javascript/dashboard/i18n/locale/cs/search.json
+++ b/app/javascript/dashboard/i18n/locale/cs/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/da/search.json b/app/javascript/dashboard/i18n/locale/da/search.json
index 35a3d3ab0..a87685f4b 100644
--- a/app/javascript/dashboard/i18n/locale/da/search.json
+++ b/app/javascript/dashboard/i18n/locale/da/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/de/search.json b/app/javascript/dashboard/i18n/locale/de/search.json
index ea4ff12d7..b7ce03892 100644
--- a/app/javascript/dashboard/i18n/locale/de/search.json
+++ b/app/javascript/dashboard/i18n/locale/de/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/el/search.json b/app/javascript/dashboard/i18n/locale/el/search.json
index 61247e0bf..0fc63cfd2 100644
--- a/app/javascript/dashboard/i18n/locale/el/search.json
+++ b/app/javascript/dashboard/i18n/locale/el/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
index 1a8723fd0..af1f0216d 100644
--- a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
@@ -43,7 +43,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Atributo personalizado añadido correctamente!",
-        "ERROR_MESSAGE": "Could not create a Custom Attribute. Please try again later."
+        "ERROR_MESSAGE": "No se pudo crear un atributo personalizado. Por favor, inténtalo de nuevo más tarde."
       }
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 71012894d..a50b18ad7 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -15,7 +15,7 @@
     "INITIATED_FROM": "Iniciado desde",
     "INITIATED_AT": "Iniciado el",
     "IP_ADDRESS": "Dirección IP",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "Creado",
     "NEW_MESSAGE": "Nuevo mensaje",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "No hay conversaciones previas asociadas a este contacto.",
diff --git a/app/javascript/dashboard/i18n/locale/es/helpCenter.json b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
index 22dbb8c90..77b7340d7 100644
--- a/app/javascript/dashboard/i18n/locale/es/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
@@ -12,8 +12,8 @@
       },
       "TITLES": {
         "ALL_ARTICLES": "Todos los artículos",
-        "MINE": "Todos los artículos",
-        "DRAFT": "Borrador de artículos",
+        "MINE": "Mis artículos",
+        "DRAFT": "Articulos borradores",
         "ARCHIVED": "Artículos archivados"
       }
     },
@@ -32,11 +32,11 @@
       "IMAGE_UPLOAD": {
         "TITLE": "Subir imagen",
         "UPLOADING": "Subiendo...",
-        "SUCCESS": "Image uploaded successfully",
-        "ERROR": "Error while uploading image",
-        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
-        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
-        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+        "SUCCESS": "Imagen subida con éxito",
+        "ERROR": "Error al subir la imagen",
+        "ERROR_FILE_SIZE": "El tamaño de la imagen debe ser menor que {size}MB",
+        "ERROR_FILE_FORMAT": "El formato de la imagen debe ser jpg, jpeg o png",
+        "ERROR_FILE_DIMENSIONS": "Las dimensiones de la imagen deben ser menores de 2000 x 2000"
       }
     },
     "ARTICLE_SETTINGS": {
@@ -77,7 +77,7 @@
     "PORTAL": {
       "HEADER": "Portales",
       "DEFAULT": "Predeterminado",
-      "NEW_BUTTON": "Nuevo Portal",
+      "NEW_BUTTON": "Portal Nuevo",
       "ACTIVE_BADGE": "activo",
       "CHOOSE_LOCALE_LABEL": "Elige un idioma",
       "LOADING_MESSAGE": "Cargando portales...",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index d3f70563c..a62477ccc 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -346,15 +346,15 @@
         "DESC": "Has terminado de integrar correctamente tu página de Facebook con Chatwoot. La próxima vez que un cliente envíe un mensaje a tu Página, la conversación aparecerá automáticamente en tu bandeja de entrada.<br>También le estamos proporcionando un script de widget que puede agregar fácilmente a su sitio web. Una vez que esto está en vivo en tu sitio web, los clientes pueden enviarle mensajes directamente desde su sitio web sin la ayuda de ninguna herramienta externa y la conversación aparecerá aquí, en Chatwoot.<br>¿Genial, eh? Bueno, estamos seguros de que intentaremos ser :)"
       },
       "EMAIL_PROVIDER": {
-        "TITLE": "Select your email provider",
-        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+        "TITLE": "Selecciona tu proveedor de correo",
+        "DESCRIPTION": "Seleccione un proveedor de correo electrónico de la siguiente lista. Si no ve a su proveedor de correo en la lista, puede seleccionar la opción de otro proveedor y proporcionar las credenciales IMAP y SMTP."
       },
       "MICROSOFT": {
         "TITLE": "Microsoft Email",
-        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "EMAIL_PLACEHOLDER": "Enter email address",
-        "HELP": "To add your Microsoft account as a channel, you need to authenticate your Microsoft account by clicking on 'Sign in with Microsoft' ",
-        "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
+        "DESCRIPTION": "Haga clic en el botón Iniciar sesión con Microsoft para empezar. Serás redirigido a la página de inicio de sesión de correo electrónico. Una vez que aceptes los permisos solicitados, serás redirigido al paso de creación de la bandeja de entrada.",
+        "EMAIL_PLACEHOLDER": "Introduzca la dirección de correo",
+        "HELP": "Para añadir su cuenta de Microsoft como un canal, debe autenticar su cuenta de Microsoft haciendo clic en 'Iniciar sesión con Microsoft' ",
+        "ERROR_MESSAGE": "Hubo un error al conectarse a Microsoft, por favor inténtalo de nuevo"
       }
     },
     "DETAILS": {
@@ -472,12 +472,12 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permitir mensajes después de la conversación resuelta",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permitir a los usuarios finales enviar mensajes incluso después de que la conversación sea resuelta.",
       "WHATSAPP_SECTION_SUBHEADER": "Esta clave de API se utiliza para la integración con las APIs de WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Introduzca la clave actualizada para la integración con las API de WhatsApp.",
       "WHATSAPP_SECTION_TITLE": "Clave de API",
-      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
-      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "Actualizar Clave API",
+      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Introduzca aquí la nueva Clave API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizar",
-      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Actualizar configuración de Formulario de Chat"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Límite de asignación automática",
@@ -566,7 +566,7 @@
     },
     "MICROSOFT": {
       "TITLE": "Microsoft",
-      "SUBTITLE": "Reauthorize your MICROSOFT account"
+      "SUBTITLE": "Reautorizar su cuenta MICROSOFT"
     },
     "SMTP": {
       "TITLE": "SMTP",
@@ -689,7 +689,7 @@
     },
     "EMAIL_PROVIDERS": {
       "MICROSOFT": "Microsoft",
-      "OTHER_PROVIDERS": "Other Providers"
+      "OTHER_PROVIDERS": "Otros proveedores"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index d74d23edd..39484d6bb 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -15,8 +15,8 @@
             "MESSAGE_CREATED": "Mensaje creado",
             "MESSAGE_UPDATED": "Mensaje actualizado",
             "WEBWIDGET_TRIGGERED": "Widget de Live Chat abierto por el usuario",
-            "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONTACT_CREATED": "Contacto creado",
+            "CONTACT_UPDATED": "Contacto actualizado"
           }
         },
         "END_POINT": {
@@ -79,11 +79,11 @@
       }
     },
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the room",
-      "START_VIDEO_CALL_HELP_TEXT": "Start a new video call with the customer",
-      "JOIN_ERROR": "There was an error joining the call, please try again",
-      "CREATE_ERROR": "There was an error creating a meeting link, please try again"
+      "CLICK_HERE_TO_JOIN": "Haga clic aquí para unirse",
+      "LEAVE_THE_ROOM": "Abandonar la sala",
+      "START_VIDEO_CALL_HELP_TEXT": "Iniciar una nueva videollamada con el cliente",
+      "JOIN_ERROR": "Hubo un error al unirse a la llamada, por favor intente de nuevo",
+      "CREATE_ERROR": "Hubo un error al crear un enlace de reunión, por favor inténtelo de nuevo"
     },
     "DELETE": {
       "BUTTON_TEXT": "Eliminar",
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index c645f7285..28ff554c7 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -427,10 +427,10 @@
       "UNASSIGNED": "Sin asignar"
     },
     "CONVERSATION_HEATMAP": {
-      "HEADER": "Conversation Traffic",
-      "NO_CONVERSATIONS": "No conversations",
-      "CONVERSATION": "%{count} conversation",
-      "CONVERSATIONS": "%{count} conversations"
+      "HEADER": "Tráfico de Conversación",
+      "NO_CONVERSATIONS": "No hay conversaciones",
+      "CONVERSATION": "%{count} conversación",
+      "CONVERSATIONS": "%{count} conversaciones"
     },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversaciones por agentes",
@@ -451,12 +451,12 @@
     }
   },
   "DAYS_OF_WEEK": {
-    "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
-    "SATURDAY": "Saturday"
+    "SUNDAY": "Domingo",
+    "MONDAY": "Lunes",
+    "TUESDAY": "Martes",
+    "WEDNESDAY": "Miércoles",
+    "THURSDAY": "Jueves",
+    "FRIDAY": "Viernes",
+    "SATURDAY": "Sábado"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/search.json b/app/javascript/dashboard/i18n/locale/es/search.json
index cb204ce9f..15fbb3e8f 100644
--- a/app/javascript/dashboard/i18n/locale/es/search.json
+++ b/app/javascript/dashboard/i18n/locale/es/search.json
@@ -11,12 +11,13 @@
       "CONVERSATIONS": "Conversaciones",
       "MESSAGES": "Mensajes"
     },
-    "EMPTY_STATE": "No %{item} found for query '%{query}'",
-    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "EMPTY_STATE": "Ningún %{item} encontrado para la consulta '%{query}'",
+    "EMPTY_STATE_FULL": "No se han encontrado resultados para la consulta '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ para enfocar",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
-    "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "READ_MORE": "Leer más",
+    "WROTE": "escribió:"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index ab3659b1f..37c40451a 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -59,18 +59,18 @@
         "TITLE": "Notificaciones con sonido",
         "NOTE": "Active las notificaciones de sonido en el tablero para los mensajes nuevos y conversaciones.",
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Eventos de alerta:",
           "NONE": "Ninguna",
           "ASSIGNED": "Conversaciones asignadas",
           "ALL_CONVERSATIONS": "Todas las conversaciones"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "Tono de alerta:"
         },
         "CONDITIONS": {
-          "TITLE": "Alert conditions:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
-          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+          "TITLE": "Condiciones de alerta:",
+          "CONDITION_ONE": "Enviar alertas de audio sólo si la ventana del navegador no está activa",
+          "CONDITION_TWO": "Enviar alertas cada 30s hasta que todas las conversaciones asignadas sean leídas"
         }
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
@@ -80,7 +80,7 @@
         "CONVERSATION_CREATION": "Enviar notificaciones por correo electrónico cuando se crea una nueva conversación",
         "CONVERSATION_MENTION": "Enviar notificaciones por correo electrónico cuando sea mencionado en una conversación",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envirar notificaciones por correo electrónico cuando un nuevo mensaje es creado en una conversación asignada",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Enviar notificaciones por correo electrónico cuando se crea un nuevo mensaje en una conversación participante"
       },
       "API": {
         "UPDATE_SUCCESS": "Sus preferencias de notificación se actualizaron correctamente",
@@ -93,7 +93,7 @@
         "CONVERSATION_CREATION": "Enviar notificaciones push cuando se crea una nueva conversación",
         "CONVERSATION_MENTION": "Enviar notificaciones push cuando sea mencionado en una conversación",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Enviar notificaciones push cuando un nuevo mensaja es creadao en una conversación asignada",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Enviar notificaciones push cuando se crea un nuevo mensaje en una conversación participante",
         "HAS_ENABLED_PUSH": "Ha habilitado notificaciones push para este navegador.",
         "REQUEST_PUSH": "Habilitar notificaciones push"
       },
@@ -287,7 +287,7 @@
     }
   },
   "KEYBOARD_SHORTCUTS": {
-    "TOGGLE_MODAL": "View all shortcuts",
+    "TOGGLE_MODAL": "Ver todos los accesos rápidos",
     "TITLE": {
       "OPEN_CONVERSATION": "Abrir conversación",
       "RESOLVE_AND_NEXT": "Resolver y pasar al siguiente",
diff --git a/app/javascript/dashboard/i18n/locale/es/signup.json b/app/javascript/dashboard/i18n/locale/es/signup.json
index 38b91dd36..a50166b4c 100644
--- a/app/javascript/dashboard/i18n/locale/es/signup.json
+++ b/app/javascript/dashboard/i18n/locale/es/signup.json
@@ -1,12 +1,12 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Create an account",
+    "TRY_WOOT": "Crear una cuenta",
     "TITLE": "Registrarse",
     "TESTIMONIAL_HEADER": "Todo lo que se necesita es un paso adelante",
     "TESTIMONIAL_CONTENT": "Usted está a un paso de involucrar a sus clientes, conservarlos y encontrar nuevos.",
-    "TERMS_ACCEPT": "By creating an account, 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>",
+    "TERMS_ACCEPT": "Al crear una cuenta, aceptas nuestros <a href=\"https://www.chatwoot.com/terms\">Términos y condiciones</a> y nuestra <a href=\"https://www.chatwoot.com/privacy-policy\">Política de privacidad</a>",
     "OAUTH": {
-      "GOOGLE_SIGNUP": "Sign up with Google"
+      "GOOGLE_SIGNUP": "Registrarse con Google"
     },
     "COMPANY_NAME": {
       "LABEL": "Nombre de la empresa",
@@ -38,7 +38,7 @@
       "SUCCESS_MESSAGE": "Registro Exitoso",
       "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
     },
-    "SUBMIT": "Create account",
+    "SUBMIT": "Crear una cuenta",
     "HAVE_AN_ACCOUNT": "¿Ya tienes una cuenta?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/search.json b/app/javascript/dashboard/i18n/locale/fa/search.json
index 610a25313..18cd327c8 100644
--- a/app/javascript/dashboard/i18n/locale/fa/search.json
+++ b/app/javascript/dashboard/i18n/locale/fa/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "جستجوی پیام‌ها، مخاطبین یا گفتگوها",
+    "EMPTY_STATE_DEFAULT": "جستجو بر اساس شناسه گفتگو، ایمیل، شماره تلفن، پیام‌ها برای نتایج جستجوی بهتر.",
     "BOT_LABEL": "ربات",
     "READ_MORE": "ادامه مطلب",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/fi/search.json b/app/javascript/dashboard/i18n/locale/fi/search.json
index f53e59699..c9924167c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/search.json
+++ b/app/javascript/dashboard/i18n/locale/fi/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Botti",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/fr/search.json b/app/javascript/dashboard/i18n/locale/fr/search.json
index 5ff8321e4..c3129a175 100644
--- a/app/javascript/dashboard/i18n/locale/fr/search.json
+++ b/app/javascript/dashboard/i18n/locale/fr/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/he/search.json b/app/javascript/dashboard/i18n/locale/he/search.json
index 3247a02fd..12c207998 100644
--- a/app/javascript/dashboard/i18n/locale/he/search.json
+++ b/app/javascript/dashboard/i18n/locale/he/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "בוט",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hi/search.json b/app/javascript/dashboard/i18n/locale/hi/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/search.json
+++ b/app/javascript/dashboard/i18n/locale/hi/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hu/search.json b/app/javascript/dashboard/i18n/locale/hu/search.json
index 094fc6f60..21d4522e5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/search.json
+++ b/app/javascript/dashboard/i18n/locale/hu/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hy/search.json b/app/javascript/dashboard/i18n/locale/hy/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/hy/search.json
+++ b/app/javascript/dashboard/i18n/locale/hy/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/id/search.json b/app/javascript/dashboard/i18n/locale/id/search.json
index 84b59bcef..e79e2ee85 100644
--- a/app/javascript/dashboard/i18n/locale/id/search.json
+++ b/app/javascript/dashboard/i18n/locale/id/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/is/search.json b/app/javascript/dashboard/i18n/locale/is/search.json
index 3d4a8b532..a9c463e37 100644
--- a/app/javascript/dashboard/i18n/locale/is/search.json
+++ b/app/javascript/dashboard/i18n/locale/is/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/it/search.json b/app/javascript/dashboard/i18n/locale/it/search.json
index 634463e6b..240306055 100644
--- a/app/javascript/dashboard/i18n/locale/it/search.json
+++ b/app/javascript/dashboard/i18n/locale/it/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ja/search.json b/app/javascript/dashboard/i18n/locale/ja/search.json
index b3f9b9cd1..01e57baaa 100644
--- a/app/javascript/dashboard/i18n/locale/ja/search.json
+++ b/app/javascript/dashboard/i18n/locale/ja/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ka/search.json b/app/javascript/dashboard/i18n/locale/ka/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/search.json
+++ b/app/javascript/dashboard/i18n/locale/ka/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ko/search.json b/app/javascript/dashboard/i18n/locale/ko/search.json
index e8eb30370..9f104952a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/search.json
+++ b/app/javascript/dashboard/i18n/locale/ko/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "봇",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/lt/search.json b/app/javascript/dashboard/i18n/locale/lt/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/lt/search.json
+++ b/app/javascript/dashboard/i18n/locale/lt/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/lv/search.json b/app/javascript/dashboard/i18n/locale/lv/search.json
index 0373eb213..8bd65d985 100644
--- a/app/javascript/dashboard/i18n/locale/lv/search.json
+++ b/app/javascript/dashboard/i18n/locale/lv/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "Vaicājumam '%{query}' nav atrasts neviens %{item} vienums",
     "EMPTY_STATE_FULL": "Vaicājumam '%{query}' nav atrasts neviens rezultāts",
     "PLACEHOLDER_KEYBINDING": "/ fokusēt",
-    "INPUT_PLACEHOLDER": "Meklēt ziņas saturu, kontaktpersonas vārdu, e-pastu vai tālruni vai sarunas",
+    "INPUT_PLACEHOLDER": "Meklēt ziņas, kontaktpersonas vai sarunas",
+    "EMPTY_STATE_DEFAULT": "Lai iegūtu labākus meklēšanas rezultātus, meklējiet pēc sarunas Id, e-pasta, tālruņa numura vai ziņām.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Lasīt vairāk",
     "WROTE": "rakstīja:"
diff --git a/app/javascript/dashboard/i18n/locale/ml/search.json b/app/javascript/dashboard/i18n/locale/ml/search.json
index de2961ae7..86dfcafd6 100644
--- a/app/javascript/dashboard/i18n/locale/ml/search.json
+++ b/app/javascript/dashboard/i18n/locale/ml/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "ബോട്ട്",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ms/search.json b/app/javascript/dashboard/i18n/locale/ms/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/ms/search.json
+++ b/app/javascript/dashboard/i18n/locale/ms/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ne/search.json b/app/javascript/dashboard/i18n/locale/ne/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/search.json
+++ b/app/javascript/dashboard/i18n/locale/ne/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/nl/search.json b/app/javascript/dashboard/i18n/locale/nl/search.json
index 85013f4cf..595cf3de3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/search.json
+++ b/app/javascript/dashboard/i18n/locale/nl/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/no/search.json b/app/javascript/dashboard/i18n/locale/no/search.json
index ec842ddfc..f5d1a62a4 100644
--- a/app/javascript/dashboard/i18n/locale/no/search.json
+++ b/app/javascript/dashboard/i18n/locale/no/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/pl/search.json b/app/javascript/dashboard/i18n/locale/pl/search.json
index c304d544c..3fed02781 100644
--- a/app/javascript/dashboard/i18n/locale/pl/search.json
+++ b/app/javascript/dashboard/i18n/locale/pl/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/pt/search.json b/app/javascript/dashboard/i18n/locale/pt/search.json
index be41e0c16..7d148d157 100644
--- a/app/javascript/dashboard/i18n/locale/pt/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index db4550b5d..1f5f59460 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -427,10 +427,10 @@
       "UNASSIGNED": "Não atribuída"
     },
     "CONVERSATION_HEATMAP": {
-      "HEADER": "Conversation Traffic",
-      "NO_CONVERSATIONS": "No conversations",
-      "CONVERSATION": "%{count} conversation",
-      "CONVERSATIONS": "%{count} conversations"
+      "HEADER": "Tráfego de conversa",
+      "NO_CONVERSATIONS": "Não há conversas",
+      "CONVERSATION": "%{count} conversa",
+      "CONVERSATIONS": "%{count} conversas"
     },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversas por agentes",
@@ -451,12 +451,12 @@
     }
   },
   "DAYS_OF_WEEK": {
-    "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
-    "SATURDAY": "Saturday"
+    "SUNDAY": "Domingo",
+    "MONDAY": "Segunda-Feira",
+    "TUESDAY": "Terça-feira",
+    "WEDNESDAY": "Quarta-feira",
+    "THURSDAY": "Quinta-feira",
+    "FRIDAY": "Sexta-feira",
+    "SATURDAY": "Sábado"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/search.json b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
index 7816b5fbd..c44e6d910 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
@@ -11,12 +11,13 @@
       "CONVERSATIONS": "Conversas",
       "MESSAGES": "Mensagens"
     },
-    "EMPTY_STATE": "No %{item} found for query '%{query}'",
-    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "EMPTY_STATE": "Não foi encontrado %{item} para a consulta '%{query}'",
+    "EMPTY_STATE_FULL": "Nenhum resultado encontrado para a consulta '%{query}'",
+    "PLACEHOLDER_KEYBINDING": "/ para focar",
+    "INPUT_PLACEHOLDER": "Pesquisar mensagens, contatos ou conversas",
+    "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca.",
     "BOT_LABEL": "Bot",
-    "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "READ_MORE": "Saiba mais",
+    "WROTE": "escreveu:"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/search.json b/app/javascript/dashboard/i18n/locale/ro/search.json
index fee8babb7..8f6d7b783 100644
--- a/app/javascript/dashboard/i18n/locale/ro/search.json
+++ b/app/javascript/dashboard/i18n/locale/ro/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ru/search.json b/app/javascript/dashboard/i18n/locale/ru/search.json
index c5e5b3811..41a9b22a3 100644
--- a/app/javascript/dashboard/i18n/locale/ru/search.json
+++ b/app/javascript/dashboard/i18n/locale/ru/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "Не найдено %{item} для запроса '%{query}'",
     "EMPTY_STATE_FULL": "Ничего не найдено по запросу '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ фокусироваться",
-    "INPUT_PLACEHOLDER": "Поиск содержимого сообщения, контакта, имени электронной почты или телефонных разговоров",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Читать далее",
     "WROTE": "написал:"
diff --git a/app/javascript/dashboard/i18n/locale/sk/search.json b/app/javascript/dashboard/i18n/locale/sk/search.json
index 562334b1f..b6b6230bc 100644
--- a/app/javascript/dashboard/i18n/locale/sk/search.json
+++ b/app/javascript/dashboard/i18n/locale/sk/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/sr/search.json b/app/javascript/dashboard/i18n/locale/sr/search.json
index 6614a9d64..8bdc6ade8 100644
--- a/app/javascript/dashboard/i18n/locale/sr/search.json
+++ b/app/javascript/dashboard/i18n/locale/sr/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/sv/search.json b/app/javascript/dashboard/i18n/locale/sv/search.json
index 7b1900c2c..1bd9f2553 100644
--- a/app/javascript/dashboard/i18n/locale/sv/search.json
+++ b/app/javascript/dashboard/i18n/locale/sv/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ta/search.json b/app/javascript/dashboard/i18n/locale/ta/search.json
index d2c1e6643..1237029e7 100644
--- a/app/javascript/dashboard/i18n/locale/ta/search.json
+++ b/app/javascript/dashboard/i18n/locale/ta/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/th/search.json b/app/javascript/dashboard/i18n/locale/th/search.json
index 73baf18b0..5fd7fa49f 100644
--- a/app/javascript/dashboard/i18n/locale/th/search.json
+++ b/app/javascript/dashboard/i18n/locale/th/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "บอท",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/tr/search.json b/app/javascript/dashboard/i18n/locale/tr/search.json
index 4cda5d3bc..10df26c50 100644
--- a/app/javascript/dashboard/i18n/locale/tr/search.json
+++ b/app/javascript/dashboard/i18n/locale/tr/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/uk/search.json b/app/javascript/dashboard/i18n/locale/uk/search.json
index 7049ce33a..a60da2440 100644
--- a/app/javascript/dashboard/i18n/locale/uk/search.json
+++ b/app/javascript/dashboard/i18n/locale/uk/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ur/search.json b/app/javascript/dashboard/i18n/locale/ur/search.json
index 8a6ab8074..92a67f207 100644
--- a/app/javascript/dashboard/i18n/locale/ur/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/search.json b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
index f3823f134..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/vi/search.json b/app/javascript/dashboard/i18n/locale/vi/search.json
index 03cd14b35..4b34c58f7 100644
--- a/app/javascript/dashboard/i18n/locale/vi/search.json
+++ b/app/javascript/dashboard/i18n/locale/vi/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/search.json b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
index 53db0dd37..0ca464482 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "机器人",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/search.json b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
index 49123b44b..fe2171e56 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
@@ -14,7 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search message content, contact name, email or phone or conversations",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "機器人",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index f01cfa65b..f4e120eb1 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -90,8 +90,8 @@
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the call"
+      "CLICK_HERE_TO_JOIN": "Haga clic aquí para unirse",
+      "LEAVE_THE_ROOM": "Salir de la llamada"
     }
   }
 }
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 395560ad8..ec7bf3d9e 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -129,12 +129,12 @@ ar:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} من %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} من %{inbox_name} <%{reply_email}>'
+          from_with_name: "%{assignee_name} من %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} من %{inbox_name} <%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} من %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} من %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "رسائل جديدة في هذه المحادثة"
       transcript_subject: "نص المحادثة"
     survey:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b65e15575..0efcd41ec 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -129,12 +129,12 @@ bg:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0b2f43bdf..59dac11b5 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -129,12 +129,12 @@ ca:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Missatges nous en aquesta conversa"
       transcript_subject: "Transcripció de conversa"
     survey:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 56662e6af..d0da91f7a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -129,12 +129,12 @@ cs:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nové zprávy v této konverzaci"
       transcript_subject: "Přepis konverzace"
     survey:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e2a0990ac..a3bac1546 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -129,12 +129,12 @@ da:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} fra %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} fra %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} fra %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} fra %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} fra %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} fra %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nye beskeder i denne samtale"
       transcript_subject: "Samtaleudskrift"
     survey:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4181e554b..cd3f74a42 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -129,12 +129,12 @@ de:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} von %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} von %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} von %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} von %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} von %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} von %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Neue Nachrichten in dieser Unterhaltung"
       transcript_subject: "Gesprächsprotokoll"
     survey:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4ffbd32f2..a412c86f3 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -129,12 +129,12 @@ el:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} από %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} από %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} από %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} από %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} από %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} από %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "νέα μηνύματα σε αυτήν την συνομιλία"
       transcript_subject: "Μεταγραφή Συνομιλίας"
     survey:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2f8b1dfb3..9ad08ccb9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -45,7 +45,7 @@ es:
       locale:
         unique: debe ser único en la categoría y el portal
     dyte:
-      invalid_message_type: "Invalid message type. Action not permitted"
+      invalid_message_type: "Tipo de mensaje inválido. Acción no permitida"
     inboxes:
       imap:
         socket_error: Verifique la conexión de red, la dirección IMAP y vuelva a intentarlo.
@@ -129,12 +129,12 @@ es:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} de %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} de %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} de %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} de %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nuevos mensajes en esta conversación"
       transcript_subject: "Transcripción de la conversación"
     survey:
@@ -145,8 +145,8 @@ es:
   integration_apps:
     dyte:
       name: "Dyte"
-      description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
-      meeting_name: "%{agent_name} has started a meeting"
+      description: "Dyte es una herramienta que te ayuda a agregar audio y vídeo en vivo a tu aplicación con unas pocas líneas de código. Esta integración le permite dar una opción a sus agentes para tener una videollamada o llamada de voz con sus clientes sin salir de Chatwoot."
+      meeting_name: "%{agent_name} ha iniciado una reunión"
     slack:
       name: "Slack"
       description: "Slack es una herramienta de chat que reúne toda su comunicación en un solo lugar. Al integrar Slack, puede ser notificado de todas las nuevas conversaciones en su cuenta directamente dentro de su Slack."
@@ -160,8 +160,8 @@ es:
       name: "Nombre completo"
       description: "La integración con FullContact enriquece los perfiles de los visitantes. Identifique a los usuarios tan pronto compartan la dirección de correo electrónico y ofrezca un servicio al cliente personalizado. Conecte su cuenta de FullContact usando al clave de la API."
     google_translate:
-      name: "Google Translate"
-      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+      name: "Traductor de Google"
+      description: "Facilita a los agentes la traducción de mensajes añadiendo una integración de traducción de Google. Google Translate ayuda a identificar el idioma automáticamente y convertirlo al idioma elegido por el agente o administrador de la cuenta."
   public_portal:
     search:
       search_placeholder: Buscar artículo por título o cuerpo...
@@ -172,12 +172,12 @@ es:
       sub_title: Busque aquí los artículos o busque las categorías de abajo.
     common:
       home: Inicio
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
+      last_updated_on: Última actualización el %{last_updated_on}
+      view_all_articles: Ver todos los artículos
+      article: artículo
       articles: artículos
-      no_articles: There are no articles here
+      no_articles: No hay artículos aquí
     footer:
-      made_with: Made with
+      made_with: Hecho con
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Ir al sitio principal
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index a79863c87..4a07336b0 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -129,12 +129,12 @@ fa:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} از %{inbox_name} «%{from_email}»'
-          reply_with_name: '%{assignee_name} از %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} از %{inbox_name} «%{from_email}»"
+          reply_with_name: "%{assignee_name} از %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} از %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} از %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "پیام‌های جدید در این مکالمه"
       transcript_subject: "متن مکالمه"
     survey:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 1cda2927e..6bb2ab6ae 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -129,12 +129,12 @@ fi:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Uusia viestejä"
       transcript_subject: "Keskustelukopio"
     survey:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 10fa3bcd5..f878068b6 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -129,12 +129,12 @@ fr:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} de %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} de %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} de %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} de %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nouveaux messages dans cette conversation"
       transcript_subject: "Transcription de conversation"
     survey:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index b65c28085..568e419a6 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -129,12 +129,12 @@ he:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 25d130b02..eea782978 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -129,12 +129,12 @@ hi:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index aa9caa602..2c70e6df6 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -129,12 +129,12 @@ hu:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} innen %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} innen %{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}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} innen %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} innen %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Új üzenet a beszélgetésben"
       transcript_subject: "Beszélgetés kivonat"
     survey:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 6031ceacd..a840aab00 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -129,12 +129,12 @@ hy:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 1e847951a..597032c4e 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -129,12 +129,12 @@ id:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Pesan baru pada percakapan ini"
       transcript_subject: "Transkrip Percakapan"
     survey:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 73164dfe6..49c027a20 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -129,12 +129,12 @@ is:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} frá %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} frá %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} frá %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} frá %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} frá %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} frá %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 82b258a5c..fe53b7db2 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -129,12 +129,12 @@ it:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} da %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} da %{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}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} da %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} da %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nuovi messaggi in questa conversazione"
       transcript_subject: "Trascrizione della conversazione"
     survey:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0df5cabb5..8e7992848 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -129,12 +129,12 @@ ja:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "この会話に新着メッセージがあります"
       transcript_subject: "会話の記録"
     survey:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 6bdd0b2b1..45d9a8987 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -129,12 +129,12 @@ ka:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 87fe66409..a0a13b32c 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -129,12 +129,12 @@ ko:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6e0c6437d..32531ab8f 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -129,12 +129,12 @@ lt:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index b0c6cca38..4ad843f03 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -129,12 +129,12 @@ lv:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} no %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} no %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} no %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} no %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} no %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} no %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Jauni ziņojumi šajā sarunā"
       transcript_subject: "Sarunas Transkripts"
     survey:
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index f0ecdee34..7fd330ea4 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -129,12 +129,12 @@ ml:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "ഈ സംഭാഷണത്തിലെ പുതിയ സന്ദേശങ്ങൾ"
       transcript_subject: "സംഭാഷണ ട്രാൻസ്ക്രിപ്റ്റ്"
     survey:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index b281cec7b..33892203e 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -129,12 +129,12 @@ ms:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 3c4a48d24..aecf71022 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -129,12 +129,12 @@ ne:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d2077551d..f468abc3a 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -129,12 +129,12 @@ nl:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index ef5e4d914..7aa0aa3ad 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -129,12 +129,12 @@
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nye meldinger i denne samtalen"
       transcript_subject: "Kopi av samtale"
     survey:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3a0a26463..bc0633355 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -129,12 +129,12 @@ pl:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} z %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} z %{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}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} z %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} z %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nowe wiadomości w tej dyskusji"
       transcript_subject: "Transkrypcja rozmowy"
     survey:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 6fc3b217d..356cb0d11 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -129,12 +129,12 @@ pt:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} de %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} de %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} de %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} de %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Novas mensagens nesta conversa"
       transcript_subject: "Transcrição da conversa"
     survey:
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 456d5b7da..e5f1efca8 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -129,12 +129,12 @@ pt_BR:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} de %{inbox_name} <reply+%{from_email}>'
-          reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} de %{inbox_name} <reply+%{from_email}>"
+          reply_with_name: "%{assignee_name} de %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} de %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} de %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Novas mensagens nesta conversa"
       transcript_subject: "Transcrição da conversa"
     survey:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 54182a97f..c3ad3246c 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -129,12 +129,12 @@ ro:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} din %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} din %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} din %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} din %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} din %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} din %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Mesaje noi în această conversație"
       transcript_subject: "Trimite Transcriere"
     survey:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 0b850863b..3c7114a28 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -129,12 +129,12 @@ ru:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} от %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} от %{inbox_name} <%{reply_email}>'
+          from_with_name: "%{assignee_name} от %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} от %{inbox_name} <%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} от %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} от %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Новые сообщения в этом диалоге"
       transcript_subject: "Субтитры общения"
     survey:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 004499ddb..91d64a7ac 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -129,12 +129,12 @@ sk:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} z %{inbox_name} <reply+%{from_email}>'
-          reply_with_name: '%{assignee_name} z %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} z %{inbox_name} <reply+%{from_email}>"
+          reply_with_name: "%{assignee_name} z %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} z %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} z %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nové správy v tejto konverzácii"
       transcript_subject: "Prepis konverzácie"
     survey:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index ef2217084..13f61ae82 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -129,12 +129,12 @@ sr-Latn:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} iz %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} iz %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} iz %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} iz %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} iz %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} iz %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nove poruke u ovom razgovoru"
       transcript_subject: "Transkript razgovora"
     survey:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 6e9e0f51d..4a8f316cc 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -129,12 +129,12 @@ sv:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Nya meddelanden i denna konversation"
       transcript_subject: "Konversationstranskribering"
     survey:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index a5327c93b..cc180b3b4 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -129,12 +129,12 @@ ta:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "இந்த உரையாடலில் புதிய செய்திகள்"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index d20d24bd2..11a972e20 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -129,12 +129,12 @@ th:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index bbae62f70..96345a8fe 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -129,12 +129,12 @@ tr:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Bu görüşmedeki yeni mesajlar"
       transcript_subject: "Konuşma Metni"
     survey:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index bd0ab21d7..9c2e2c24c 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -129,12 +129,12 @@ uk:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} з %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} від %{inbox_name} <reply+%{reply_email}>'
+          from_with_name: "%{assignee_name} з %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} від %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} від %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} від %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Нові повідомлення в цьому діалозі"
       transcript_subject: "Транскрипція діалогу"
     survey:
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 3715db715..bbf0fe15e 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -129,12 +129,12 @@ ur:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index e9ce50818..987f44d2b 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -129,12 +129,12 @@ ur:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "New messages on this conversation"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 2874b1301..7689b7eef 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -129,12 +129,12 @@ vi:
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} từ %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} từ %{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}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} từ %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} từ %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_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:
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 1883f60e7..1e4bd7409 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -129,12 +129,12 @@ zh_CN:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "此对话中的新消息"
       transcript_subject: "Conversation Transcript"
     survey:
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index b2d35573e..92710e8c0 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -129,12 +129,12 @@ zh_TW:
     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} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} from %{inbox_name}'
-          reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
+          reply_with_name: "%{assignee_name} from %{inbox_name}"
+          reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "在對話中的新訊息"
       transcript_subject: "對話紀錄"
     survey:

From de8c26dce8edcdd6a8d78462abe85d0597018939 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 15 Mar 2023 19:52:02 +0530
Subject: [PATCH 93/94] chore: Additional indexes and fixes (#6675)

- Fix breakage related to the look-up job in Heroku deploys
- Add additional db indexes for performance optimisations
---
 app/models/conversation.rb                            |  1 +
 app/models/inbox.rb                                   |  3 ++-
 .../20230315105847_add_indexes_for_common_queries.rb  | 11 +++++++++++
 db/schema.rb                                          |  4 +++-
 lib/tasks/ip_lookup.rake                              |  2 +-
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20230315105847_add_indexes_for_common_queries.rb

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 119df82e9..43c2b0410 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -27,6 +27,7 @@
 #
 # Indexes
 #
+#  conv_acid_inbid_stat_asgnid_idx                    (account_id,inbox_id,status,assignee_id)
 #  index_conversations_on_account_id                  (account_id)
 #  index_conversations_on_account_id_and_display_id   (account_id,display_id) UNIQUE
 #  index_conversations_on_assignee_id_and_account_id  (assignee_id,account_id)
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 0c0204da1..bc086ae87 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -26,7 +26,8 @@
 #
 # Indexes
 #
-#  index_inboxes_on_account_id  (account_id)
+#  index_inboxes_on_account_id                   (account_id)
+#  index_inboxes_on_channel_id_and_channel_type  (channel_id,channel_type)
 #
 
 class Inbox < ApplicationRecord
diff --git a/db/migrate/20230315105847_add_indexes_for_common_queries.rb b/db/migrate/20230315105847_add_indexes_for_common_queries.rb
new file mode 100644
index 000000000..b16adb71f
--- /dev/null
+++ b/db/migrate/20230315105847_add_indexes_for_common_queries.rb
@@ -0,0 +1,11 @@
+class AddIndexesForCommonQueries < ActiveRecord::Migration[6.1]
+  # disabling ddl transaction is required for concurrent index creation
+  # https://thoughtbot.com/blog/how-to-create-postgres-indexes-concurrently-in
+  disable_ddl_transaction!
+
+  def change
+    ActiveRecord::Migration[6.1].add_index(:inboxes, [:channel_id, :channel_type], algorithm: :concurrently)
+    ActiveRecord::Migration[6.1].add_index(:conversations, [:account_id, :inbox_id, :status, :assignee_id], name: 'conv_acid_inbid_stat_asgnid_idx',
+                                                                                                            algorithm: :concurrently)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index eb13c753d..88cc8ef1d 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: 2023_03_13_113920) do
+ActiveRecord::Schema.define(version: 2023_03_15_105847) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -448,6 +448,7 @@ ActiveRecord::Schema.define(version: 2023_03_13_113920) do
     t.datetime "assignee_last_seen_at"
     t.datetime "first_reply_created_at"
     t.index ["account_id", "display_id"], name: "index_conversations_on_account_id_and_display_id", unique: true
+    t.index ["account_id", "inbox_id", "status", "assignee_id"], name: "conv_acid_inbid_stat_asgnid_idx"
     t.index ["account_id"], name: "index_conversations_on_account_id"
     t.index ["assignee_id", "account_id"], name: "index_conversations_on_assignee_id_and_account_id"
     t.index ["campaign_id"], name: "index_conversations_on_campaign_id"
@@ -576,6 +577,7 @@ ActiveRecord::Schema.define(version: 2023_03_13_113920) do
     t.jsonb "auto_assignment_config", default: {}
     t.boolean "lock_to_single_conversation", default: false, null: false
     t.index ["account_id"], name: "index_inboxes_on_account_id"
+    t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type"
   end
 
   create_table "installation_configs", force: :cascade do |t|
diff --git a/lib/tasks/ip_lookup.rake b/lib/tasks/ip_lookup.rake
index f1ae80100..7087e6de1 100644
--- a/lib/tasks/ip_lookup.rake
+++ b/lib/tasks/ip_lookup.rake
@@ -4,7 +4,7 @@ namespace :ip_lookup do
   task setup: :environment do
     next if File.exist?(GeocoderConfiguration::LOOK_UP_DB)
 
-    ip_lookup_api_key = ENV.fetch('IP_LOOKUP_API_KEY')
+    ip_lookup_api_key = ENV.fetch('IP_LOOKUP_API_KEY', nil)
     next if ip_lookup_api_key.blank?
 
     puts '[rake ip_lookup:setup] Fetch GeoLite2-City database'

From 565b87fa981408d5a0280d0bfd1b8c890c38e8ce Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Wed, 15 Mar 2023 19:57:59 +0530
Subject: [PATCH 94/94] Bump version to 2.15.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 5a5b23178..ec419bcc7 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.14.0'
+  version: '2.15.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 6f19d9fc2..360751991 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",